diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index 02a7257a515..27c7da146b6 100755
--- a/bin/bitbake-setup
+++ b/bin/bitbake-setup
@@ -1458,21 +1458,13 @@ def main():
 
         logger.info('Bitbake-setup is using {} as top directory.'.format(top_dir))
 
-        try:
-            if args.func == init_config:
-                init_config(top_dir, all_settings, args)
-            else:
-                d = init_bb_cache(top_dir, all_settings, args)
-                args.func(top_dir, all_settings, args, d)
+        if args.func == init_config:
+            init_config(top_dir, all_settings, args)
+        else:
+            d = init_bb_cache(top_dir, all_settings, args)
+            args.func(top_dir, all_settings, args, d)
 
-            save_bb_cache()
-        except (SystemExit, KeyboardInterrupt):
-            raise
-        except Exception as e:
-            if args.debug:
-                raise
-            logger.error(str(e))
-            sys.exit(1)
+        save_bb_cache()
     else:
         parser.print_help()