diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index 61ce7749df..52331b3fab 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -218,4 +218,6 @@ create_base_image() {
 
   ${SCRIPTS_DIR}/bin/cros_make_image_bootable "${BUILD_DIR}" \
     ${image_name} --adjust_part="${FLAGS_adjust_part}"
+
+  trap - EXIT
 }
diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index d48129bb52..d93bc6f6ac 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -42,10 +42,11 @@ install_dev_packages() {
   info "Developer image built and stored at ${image_name}"
 
   cleanup_mounts
-  trap - EXIT
 
   if should_build_image ${image_name}; then
     ${SCRIPTS_DIR}/bin/cros_make_image_bootable "${BUILD_DIR}" \
       ${image_name} --force_developer_mode --noenable_rootfs_verification
   fi
+
+  trap - EXIT
 }