diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 9e64fe5c42..cbe49fd699 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -87,7 +87,7 @@ def fire_class_handlers(event, d):
     for name, handler in _handlers.iteritems():
         try:
             execute_handler(name, handler, event, d)
-        except BaseException:
+        except Exception:
             continue
 
 ui_queue = []