diff --git a/setup/so-setup b/setup/so-setup
index 79c9b9784..84fcf5c34 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -575,7 +575,7 @@ if [[ $is_manager || $is_import ]]; then collect_so_allow; fi
 set_redirect >> $setup_log 2>&1
 
 if [[ $is_minion ]] && ! check_manager_state; then
-	whiptail_manager_error || exit 1
+	whiptail_manager_error
 fi
 
 whiptail_end_settings