diff --git a/setup/so-setup b/setup/so-setup
index 2d2275f5f..31baf3deb 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -620,11 +620,13 @@ fi
 
 success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}')
 
+if [[ $success != 0 ]]; then SO_ERROR=1; fi # evaluate success first so it doesn't check against the output of so-allow
+
 if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then 
 	IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
 fi
 
-if [[ $success != 0 || $SO_ERROR == 1 ]]; then 
+if [[ -n $SO_ERROR ]]; then 
 	SKIP_REBOOT=1
 	whiptail_setup_failed
 else