diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 21a6c8144a..4d93a35cdc 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -323,6 +323,8 @@ def main():
 if __name__ == "__main__":
     try:
         ret = main()
+    except bb.BBHandledException:
+        ret = 1
     except Exception:
         ret = 1
         import traceback