diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index 77aef7c5aa631b18ceb5e6add97fefe7f1b41e21..d83a5acc0965af1eb54e86a6bf29f291a89232ef 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/src/warden-server/sh/uninstall.sh
@@ -84,7 +84,7 @@ paramsChck()
 wardenDirChck()
 {
 	echo -n "Checking Warden server directory ... "
-	if [[ ! -d "$basedir" ]] && ; then
+	if [[ ! -d "$basedir" ]]; then
 		echo "FAILED!"
 		echo "Warden server package is not installed!"
 		exit 1
@@ -135,14 +135,14 @@ uninstallWardenServer()
 		rmdir --ignore-fail-on-non-empty "${basedir}/$directory" 2> "$err" || errClean
 	done
 	rm -f "${basedir}/uninstall.sh"
-	rmdir --ignore-fail-on-non-empty "$basedir"
+	rmdir --ignore-fail-on-non-empty "$basedir" 2> /dev/null
 	echo "OK"
 }
 
 
 deleteSymlinks()
 {
-	echo -n "Deleting symlinks from $symbin ..."
+	echo -n "Deleting symlinks from $symbin ... "
 	for file in "$symbin/"*
 	do
 		rm -f "${symbin}/${file##*/}" 2> /dev/null
@@ -199,7 +199,7 @@ uninstallWardenServer || exit 1
 [[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && deleteSymlinks
 
 echo
-echo "Please follow post-uninstallation steps in $uninstall!"
+echo "Please follow post-uninstallation steps in ${uninstall}."
 echo
 echo "Uninstallation of $package_version package was SUCCESSFUL!!!"
 echo