diff --git a/prepare_image b/prepare_image
index a292199..89b0087 100755
--- a/prepare_image
+++ b/prepare_image
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
+    set -x
+fi
+
 # ------------------------------------------------------------------------------
 # Configurations
 # ------------------------------------------------------------------------------
@@ -10,11 +14,7 @@ RETCODE=0
 
 : ${DIST=fc14}
 
-if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
-    set -x
-else
-    set -e
-fi
+set -e
 
 . ./builder_setup >/dev/null
 . ./umount_kill.sh >/dev/null
diff --git a/umount_kill.sh b/umount_kill.sh
index 6c21831..b6b1b00 100755
--- a/umount_kill.sh
+++ b/umount_kill.sh
@@ -24,6 +24,10 @@
 # ./umount_kill.sh chroot-jessie
 #
 
+if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
+    set -x
+fi
+
 . ./functions.sh
 
 mountPoint() {