diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index d5450f096..0390a2bf2 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -340,6 +340,7 @@ run_check_net_err() {
 	fi
 	
 	if [[ $exit_code -ne 0 ]]; then
+		ERR_HANDLED=true
 		echo "Command failed with error $exit_code"
 		echo "$err_msg"
 		exit $exit_code
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 2f27939e6..9a1afb2bb 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -30,6 +30,7 @@ check_err() {
   local exit_code=$1
   local err_msg="Unhandled error occured, please check $SOUP_LOG for details."
 
+  [[ $ERR_HANDLED == true ]] && exit $exit_code
   if [[ $exit_code -ne 0 ]]; then
     printf '%s' "Soup failed with error $exit_code: "
     case $exit_code in