diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 470e9dcc43..e6ce8d9438 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -58,7 +58,11 @@ class BBConfiguration(object):
 
 
 def print_exception(*exc_info):
-    logger.error("Uncaught exception: ", exc_info=exc_info)
+    if not isinstance(exc_info[0], SystemExit):
+        if isinstance(exc_info[0], KeyboardInterrupt):
+            logger.error("User aborted.")
+        else:
+            logger.error("Uncaught exception: ", exc_info=exc_info)
     sys.exit(1)
 
 sys.excepthook = print_exception