diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 04d775c3cd..05ff5434ac 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -72,7 +72,7 @@ def execute_handler(name, handler, event, d):
     event.data = d
     try:
         ret = handler(event)
-    except bb.parse.SkipPackage:
+    except (bb.parse.SkipPackage, bb.BBHandledException):
         raise
     except Exception:
         etype, value, tb = sys.exc_info()