diff --git a/meta-oe/classes/fitimage.bbclass b/meta-oe/classes/fitimage.bbclass
index c5c799e8a5..54bb704ab5 100644
--- a/meta-oe/classes/fitimage.bbclass
+++ b/meta-oe/classes/fitimage.bbclass
@@ -455,6 +455,8 @@ python write_manifest() {
                 imgpath = d.getVar("DEPLOY_DIR_IMAGE")
                 bootscriptid = imgsource
                 fitimage_emit_section_bootscript(d, fd, imgpath, imgsource)
+            else:
+                bb.fatal(f"Unsupported image type: '{imgtype}'")
         fitimage_emit_section_end(d, fd)
         #
         # Step 5: Prepare a configurations section