diff --git a/src/image_mad/remotes/fs/cp b/src/image_mad/remotes/fs/cp
index 2ef4f8a2d8..78d3236276 100755
--- a/src/image_mad/remotes/fs/cp
+++ b/src/image_mad/remotes/fs/cp
@@ -39,12 +39,14 @@ DST=$2
 case $SRC in
 http://*)
     log "Downloading $SRC to the image repository"
-    exec_and_log "$WGET -O $DST $SRC"
+    exec_and_log "$WGET -O $DST $SRC" \
+        "Error downloading $SRC"
     ;;
 
 *)
     log "Copying local image $SRC to the image repository"
-    exec_and_log "cp -f $SRC $DST"
+    exec_and_log "cp -f $SRC $DST" \
+        "Error copying $SRC to $DST"
     ;;
 esac
 
diff --git a/src/image_mad/remotes/fs/mkfs b/src/image_mad/remotes/fs/mkfs
index e57fd2fce5..e6b1949366 100755
--- a/src/image_mad/remotes/fs/mkfs
+++ b/src/image_mad/remotes/fs/mkfs
@@ -37,6 +37,8 @@ DST=$1
 FSTYPE=$2
 SIZE=$3
 
-exec_and_log "$DD if=/dev/zero of=$DST bs=1 count=1 seek=${SIZE}M"
-exec_and_log "$MKFS -t $FSTYPE -F $DST"
+exec_and_log "$DD if=/dev/zero of=$DST bs=1 count=1 seek=${SIZE}M" \
+    "Could not create image $DST"
+exec_and_log "$MKFS -t $FSTYPE -F $DST" \
+    "Unable to create filesystem $FSTYPE in $DST"
 exec_and_log "chmod 0660 $DST"
diff --git a/src/image_mad/remotes/fs/mv b/src/image_mad/remotes/fs/mv
index a1e2eadd3f..74ee2f7199 100755
--- a/src/image_mad/remotes/fs/mv
+++ b/src/image_mad/remotes/fs/mv
@@ -39,12 +39,14 @@ DST=$2
 case $SRC in
 http://*)
     log "Downloading $SRC to the image repository"
-    exec_and_log "$WGET -O $DST $SRC"
+    exec_and_log "$WGET -O $DST $SRC" \
+        "Error downloading $SRC"
     ;;
 
 *)
     log "Moving local image $SRC to the image repository"
-    exec_and_log "mv -f $SRC $DST"
+    exec_and_log "mv -f $SRC $DST" \
+        "Could not move $SRC to $DST"
     ;;
 esac
 
diff --git a/src/image_mad/remotes/fs/rm b/src/image_mad/remotes/fs/rm
index 5526887226..72b66573d2 100755
--- a/src/image_mad/remotes/fs/rm
+++ b/src/image_mad/remotes/fs/rm
@@ -36,5 +36,6 @@ SRC=$1
 
 if [ -e $SRC ] ; then
     log "Removing $SRC from the image repository"
-    exec_and_log "rm $SRC"
+    exec_and_log "rm $SRC" \
+        "Error deleting $SRC"
 fi