diff --git a/ansible/sbin/backup_images b/ansible/sbin/backup_images
index 4a333c5..01796d9 100755
--- a/ansible/sbin/backup_images
+++ b/ansible/sbin/backup_images
@@ -1,6 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
-#START=$1
 BACKUP_DIR="/root/backup"
 
 MACHINES=""
@@ -15,23 +14,14 @@ done
 cd /var/lib/risotto/srv/
 mkdir -p "$BACKUP_DIR"
 for machine in $MACHINES; do
-#    machinectl stop $machine || true
-#    while true; do
-#        machinectl status "$machine" > /dev/null 2>&1 || break
-#        sleep 1
-#    done
     BACKUP_FILE="$BACKUP_DIR/backup_$machine.tar.bz2"
     rm -f "$BACKUP_FILE"
     if [ -f "/var/lib/risotto/configurations/$machine/sbin/risotto_backup" ]; then
         machinectl -q shell $machine /usr/local/lib/sbin/risotto_backup
-        tar -cJf $BACKUP_FILE $machine/backup
-    else
-        tar -cJf $BACKUP_FILE $machine
+        tar --ignore-failed-read -cJf $BACKUP_FILE $machine/backup
+    elif [ ! -f "/var/lib/risotto/configurations/$machine/no_risotto_backup" ]; then
+        tar --ignore-failed-read -cJf $BACKUP_FILE $machine
     fi
 done
 
-#if [ -z "$START" ]; then
-#    machinectl start $MACHINES
-#fi
-
 exit 0