diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index d7e2e187c..65c38b4f7 100755
--- a/bin/bitbake-setup
+++ b/bin/bitbake-setup
@@ -1193,4 +1193,11 @@ def main():
         parser.print_help()
 
 if __name__ == '__main__':
-    main()
+    if __version__ != bb.__version__:
+        sys.exit("Bitbake core version and program version mismatch!")
+    try:
+        sys.exit(main())
+    except Exception:
+        import traceback
+        traceback.print_exc()
+        sys.exit(1)