diff --git a/setenv-android.sh b/setenv-android.sh
index 234b0fd7..b94a08fc 100755
--- a/setenv-android.sh
+++ b/setenv-android.sh
@@ -207,8 +207,8 @@ fi
 
 # Error checking
 if [ ! -e "$AOSP_TOOLCHAIN_PATH/$RANLIB" ]; then
-  echo "ERROR: Failed to find Android ranlib. Please edit this script."
-  # exit 1
+	echo "ERROR: Failed to find Android ranlib. Please edit this script."
+	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
 fi
 
 # Error checking
@@ -219,8 +219,8 @@ fi
 
 # Error checking
 if [ ! -e "$AOSP_TOOLCHAIN_PATH/$AS" ]; then
-  echo "ERROR: Failed to find Android as. Please edit this script."
-# exit 1
+	echo "ERROR: Failed to find Android as. Please edit this script."
+	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
 fi
 
 # Error checking
@@ -339,3 +339,5 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
     echo "AOSP_BITS_INC: $AOSP_BITS_INC"
   fi
 fi
+
+[ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0
diff --git a/setenv-embedded.sh b/setenv-embedded.sh
index 50cdab14..75657aee 100755
--- a/setenv-embedded.sh
+++ b/setenv-embedded.sh
@@ -128,3 +128,5 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" -ne 0 ]; then
   echo "ARM_EMBEDDED_FLAGS: $ARM_EMBEDDED_FLAGS"
   echo "ARM_EMBEDDED_SYSROOT: $ARM_EMBEDDED_SYSROOT"
 fi
+
+[ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0
\ No newline at end of file