diff --git a/Justfile b/Justfile
index ccb5215..c58d80b 100755
--- a/Justfile
+++ b/Justfile
@@ -150,8 +150,8 @@ rebuild-disk device:
 	set -xe
 
 	just -v disk-mount {{device}}
+	trap "set +e; just -v disk-umount {{device}}" EXIT
 	just -v disk-install {{device}}
-	just -v disk-umount {{device}}
 
 # Re-render the versions of the given offline system and reinstall it in offline-mode
 update-disk dir: