diff --git a/setup/so-functions b/setup/so-functions
index 8a751a4ad..e2e779775 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -563,7 +563,7 @@ collect_patch_schedule_name_import() {
 
 collect_proxy() {
 	[[ -n $TESTING ]] && return
-	collect_proxy_details
+	collect_proxy_details || return
 	while ! proxy_validate; do
 		if whiptail_invalid_proxy; then
 			collect_proxy_details no_ask
@@ -608,6 +608,8 @@ collect_proxy_details() {
 			so_proxy="$proxy_addr"
 		fi
 		export so_proxy
+	else
+		return 1
 	fi
 }
 
diff --git a/setup/so-whiptail b/setup/so-whiptail
index e81c0be7c..fddf3b0fa 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -391,6 +391,7 @@ whiptail_dockernet_net() {
 	whiptail_check_exitstatus $exitstatus
 
 }
+
 whiptail_enable_components() {
 
 	[ -n "$TESTING" ] && return