diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index 91a7e126fd..1d60a017e3 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -359,10 +359,10 @@ EOF`
 function ssh_exec_and_log
 {
     ssh_exec_and_log_no_error "$@"
-    rc=$?
+    EXEC_RC=$?
 
-    if [ $rc !=0 ]; then
-        exit $rc
+    if [ "$EXEC_RC" != "0" ]; then
+        exit $EXEC_RC
     fi
 }
 
diff --git a/src/tm_mad/common/mkimage b/src/tm_mad/common/mkimage
index 43c296c88e..014bd188e5 100755
--- a/src/tm_mad/common/mkimage
+++ b/src/tm_mad/common/mkimage
@@ -54,9 +54,16 @@ ssh_make_path $DST_HOST $DST_DIR
 MKFS_CMD=`mkfs_command $DST_PATH $FSTYPE $SIZE`
 
 MKSCRIPT=$(cat <<EOF
-set -e -o pipefail
 export PATH=/usr/sbin:/sbin:\$PATH
 $MKFS_CMD
+
+rc=\$?
+
+if [ "\$rc" != "0" ]; then
+    rm -f $DST_PATH
+fi
+
+exit \$rc
 EOF
 )