diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass
index ba01bffa5f..5068f49bfc 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -51,4 +51,9 @@ python () {
             if len(items) > 1 and items[1]:
                 bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1])
                 d.appendVar('IMAGE_FSTYPES', ' ' + items[1])
+
+            # Go out as we found a match!
+            break
+    else:
+        raise ValueError("UBOOT_CONFIG %s is not supported" % ubootconfig)
 }