diff --git a/prepare_image b/prepare_image
index 89b0087..d739da7 100755
--- a/prepare_image
+++ b/prepare_image
@@ -4,6 +4,8 @@ if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
     set -x
 fi
 
+set -e
+
 # ------------------------------------------------------------------------------
 # Configurations
 # ------------------------------------------------------------------------------
@@ -14,8 +16,6 @@ RETCODE=0
 
 : ${DIST=fc14}
 
-set -e
-
 . ./builder_setup >/dev/null
 . ./umount_kill.sh >/dev/null
 
diff --git a/qubeize_image b/qubeize_image
index d0b485a..386ff57 100755
--- a/qubeize_image
+++ b/qubeize_image
@@ -4,6 +4,8 @@ if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
     set -x
 fi
 
+set -e
+
 # ------------------------------------------------------------------------------
 # Configurations and Conditionals
 # ------------------------------------------------------------------------------
@@ -14,8 +16,6 @@ export LC_ALL=POSIX
 . ./builder_setup >/dev/null
 . ./umount_kill.sh >/dev/null
 
-set -e
-
 if [ $# -eq 0 ]; then
     echo "usage $0 <clean_image_file> <template_name>"
     exit