diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 0ca82e5a7b..5b9294bf4e 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -250,7 +250,8 @@ Default BBFILES are the .bb files in the current directory.""")
 
         server.addcooker(cooker)
         server.saveConnectionDetails()
-    except:
+    except Exception as e:
+        exc_info = sys.exc_info()
         while True:
             try:
                 import queue
@@ -262,7 +263,7 @@ Default BBFILES are the .bb files in the current directory.""")
                 break
             if isinstance(event, logging.LogRecord):
                 logger.handle(event)
-        raise
+        raise exc_info[1], None, exc_info[2]
     server.detach()
 
     # Should no longer need to ever reference cooker