diff --git a/setup/automation/standalone-net-centos-proxy b/setup/automation/standalone-net-centos-proxy
index e8aae3813..b364c64fc 100644
--- a/setup/automation/standalone-net-centos-proxy
+++ b/setup/automation/standalone-net-centos-proxy
@@ -62,7 +62,7 @@ OSQUERY=1
 # PATCHSCHEDULEHOURS=
 PATCHSCHEDULENAME=auto
 PLAYBOOK=1
-proxy_addr=http://10.66.166.30:3128
+so_proxy=http://10.66.166.30:3128
 # REDIRECTHOST=
 REDIRECTINFO=IP
 RULESETUP=ETOPEN
diff --git a/setup/so-functions b/setup/so-functions
index c3f3503d9..300d384d0 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -536,6 +536,7 @@ collect_patch_schedule_name_import() {
 }
 
 collect_proxy() {
+	[[ -n $TESTING ]] && return
 	collect_proxy_details
 	while ! proxy_validate; do
 		if whiptail_invalid_proxy; then
@@ -571,7 +572,7 @@ collect_proxy_details() {
 
 			local url_prefixes=( 'http://' 'https://' )
 			for prefix in "${url_prefixes[@]}"; do
-				if echo "$proxy_addr" | grep "$prefix"; then
+				if echo "$proxy_addr" | grep -q "$prefix"; then
 					local proxy=${proxy_addr#"$prefix"}
 					so_proxy="${prefix}${proxy_user}:${proxy_pass}@${proxy}"
 					break
diff --git a/setup/so-whiptail b/setup/so-whiptail
index f62d4c32b..3423dfbe5 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1237,6 +1237,7 @@ whiptail_proxy_ask() {
 
 whiptail_proxy_addr() {
 	[ -n "$TESTING" ] && return
+
 	local message
 	read -r -d '' message <<- EOM
 	Please input the proxy server you wish to use, including the URL prefix (ex: https://your.proxy.com:1234).
@@ -1260,12 +1261,18 @@ whiptail_proxy_auth_user() {
 	[ -n "$TESTING" ] && return
 	
 	proxy_user=$(whiptail --title "Security Onion Setup" --inputbox "Please input the proxy user:" 8 60 "$1" 3>&1 1>&2 2>&3)
+
+	local exitstatus=$?
+	whiptail_check_exitstatus $exitstatus
 }
 
 whiptail_proxy_auth_pass() {
 	[ -n "$TESTING" ] && return
 
 	proxy_pass=$(whiptail --title "Security Onion Setup" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3)
+
+	local exitstatus=$?
+	whiptail_check_exitstatus $exitstatus
 }
 
 whiptail_requirements_error() {