diff --git a/grml-live b/grml-live
index 6107e28c..8b0adfef 100755
--- a/grml-live
+++ b/grml-live
@@ -180,10 +180,7 @@ umount_all() {
    fi
 
    umount "${CHROOT_OUTPUT}/grml-live/sources/" 2>/dev/null || /bin/true
-   if [ -n "${MIRROR_DIRECTORY}" ]; then
-     umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
-     rmdir -p "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
-   fi
+   [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
 }
 # }}}