diff --git a/setup/so-functions b/setup/so-functions
index 1ed19006f..c7c296fd3 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1417,10 +1417,10 @@ salt_checkin() {
 					LOOP_COUNT=0
 					while check_service_status "$service"; do
 						echo "$service still running" >> "$setup_log" 2>&1
-						if [ LOOP_COUNT -gt 120 ]; then
+						if [ $LOOP_COUNT -gt 120 ]; then
 							echo "$service could not be stopped in 120 seconds" >> "$setup_log" 2>&1
-							whiptail_setup_failed()
-							exit 1;
+							whiptail_setup_failed
+							exit 1
 						fi
 						sleep 1;
 						((LOOP_COUNT+=1))
@@ -1430,10 +1430,10 @@ salt_checkin() {
 					LOOP_COUNT=0
 					while ! check_service_status "$service"; do
 						echo "$service still not running" >> "$setup_log" 2>&1
-						if [ LOOP_COUNT -gt 120 ]; then
+						if [ $LOOP_COUNT -gt 120 ]; then
 							echo "$service could not be started in 120 seconds" >> "$setup_log" 2>&1
-							whiptail_setup_failed()
-							exit 1; 
+							whiptail_setup_failed
+							exit 1
 						fi
 						sleep 1;
 						((LOOP_COUNT+=1))
@@ -1444,10 +1444,10 @@ salt_checkin() {
 				LOOP_COUNT=0
 				while check_salt_master_status; do
 					echo "salt-minion cannot talk to salt-master" >> "$setup_log" 2>&1
-					if [ LOOP_COUNT -gt 20 ]; then
+					if [ $LOOP_COUNT -gt 20 ]; then
 						echo "salt-minion could not talk to salt-master after 20 attempts" >> "$setup_log" 2>&1
-						whiptail_setup_failed()
-						exit 1;
+						whiptail_setup_failed
+						exit 1
 					fi
 					sleep 1;
 					((LOOP_COUNT+=1))