diff --git a/chroot-script b/chroot-script
index 2c294653..8a35f29c 100755
--- a/chroot-script
+++ b/chroot-script
@@ -804,7 +804,7 @@ trap signal_handler HUP INT QUIT TERM
      custom_scripts upgrade_system remove_apt_cache services \
      remove_chrootmirror; do
      if stage $i ; then
-       $i || exit 1
+       $i
        stage $i 'done'
      fi
   done
diff --git a/grml-debootstrap b/grml-debootstrap
index 6c844333..14b8dae8 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -2152,7 +2152,7 @@ for i in format_efi_partition prepare_vm mkfs tunefs \
          preparechroot execute_pre_scripts chrootscript execute_post_scripts \
          remove_configs umount_chroot grub_install umount_target fscktool ; do
     if stage "${i}" ; then
-      "$i" || bailout 2 "$i"
+      "$i"
       stage "${i}" 'done'
       rm -f "${STAGES}/${i}"
     fi