diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 68e63414040c784b6beb5198bf1c95dce1fa56a1..0d5ca002944814b9f845d7ebe09adcd5881b7e0a 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -189,7 +189,7 @@ doTemplate()
 }
 
 
-cleanOldFiles()
+removeOldFiles()
 {
 	echo -n "Removing old package files ... "
 	rm -f "${etc}/warden-client.conf" 2> /dev/null
@@ -210,12 +210,17 @@ createManifest()
 
 createSymlinks()
 {
-        echo "Creating symbolic links to $symbin ..."
-        for file in "${bin}/"*
-        do
-                echo "- making symlink: ${symbin}/${file##*/} -> $file"
-                ln -s "$file" "${symbin}/${file##*/}"
-        done
+        echo -n "Checking symbolic links directory $symbin ... "
+	if [[ -d $symbin && -w $symbin ]]; then
+		echo "OK"
+	        for file in "${bin}/"*
+		do
+			echo "- making symlink: ${symbin}/${file##*/} -> $file"
+			ln -s "$file" "${symbin}/${file##*/}"
+	        done
+	else
+		echo "FAILED!"
+	fi
 }
 
 
@@ -391,14 +396,14 @@ else
         	> $watchdog_conf && echo "OK" || errClean
 fi
 
-# cleaning of files from old package - depend on package version
-cleanOldFiles
+# remove files of old packages - file list depend on package version
+removeOldFiles
 
 # create MANIFEST file
 createManifest
 
 # crate symlinks from warden server bin to user path (if -s option is set)
-[[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && createSymlinks
+[[ ! -z "$symbin" ]] && createSymlinks
 
 echo
 echo "------------------------- Summary ---------------------------------------"