diff --git a/usr/bin/archboot-aarch64-iso.sh b/usr/bin/archboot-aarch64-iso.sh
index 7283b77f3..e6619be84 100755
--- a/usr/bin/archboot-aarch64-iso.sh
+++ b/usr/bin/archboot-aarch64-iso.sh
@@ -15,6 +15,6 @@ _prepare_efitools_uefi >/dev/null 2>&1 || exit 1
 _prepare_uefi_AA64_GRUB_USB_files >/dev/null 2>&1 || exit 1
 _prepare_uefi_image >/dev/null 2>&1 || exit 1
 _grub_mkrescue || exit 1
-_create_cksum
-_cleanup_iso
+_create_cksum || exit 1
+_cleanup_iso || exit 1
 echo "Finished ISO creation."
diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh
index 549346d38..843108c4c 100755
--- a/usr/bin/archboot-x86_64-iso.sh
+++ b/usr/bin/archboot-x86_64-iso.sh
@@ -17,6 +17,6 @@ _prepare_uefi_X64_GRUB_USB_files >/dev/null 2>&1 || exit 1
 _prepare_uefi_IA32_GRUB_USB_files >/dev/null 2>&1 || exit 1
 _prepare_uefi_image >/dev/null 2>&1 || exit 1
 _grub_mkrescue || exit 1
-_create_cksum 
-_cleanup_iso 
+_create_cksum || exit 1
+_cleanup_iso || exit 1
 echo "Finished ISO creation."
diff --git a/usr/lib/archboot/iso_functions b/usr/lib/archboot/iso_functions
index 635abbab4..83d5cf12a 100644
--- a/usr/lib/archboot/iso_functions
+++ b/usr/lib/archboot/iso_functions
@@ -148,15 +148,14 @@ _grub_mkrescue() {
 }
 
 _create_cksum() {
-## create sha256sums.txt
-echo "Generating sha256sum ..."
-[[ -f  "sha256sums.txt" ]] && rm "sha256sums.txt"
-cksum -a sha256 ./*.iso > "sha256sums.txt"
+    ## create sha256sums.txt
+    echo "Generating sha256sum ..."
+    [[ -f  "sha256sums.txt" ]] && rm "sha256sums.txt"
+    cksum -a sha256 ./*.iso > "sha256sums.txt"
 }
 
 _cleanup_iso() {
-# cleanup
+    # cleanup
     echo "Cleanup remove ${_ISODIR} ..."
     [[ -d "${_ISODIR}" ]] && rm -r "${_ISODIR}"
-    [[ -d "${_SHIM}" ]] && rm -r "${_SHIM}"
 }