Merge branch '3.x'

1 files changed, 8 insertions, 2 deletions

diff --git a/sphinx/events.py b/sphinx/events.py
index 4673fddd8..fae870b4b 100644
--- a/sphinx/events.py
+++ b/sphinx/events.py
@@ -15,7 +15,7 @@ from operator import attrgetter
 from typing import Any, Callable, Dict, List, NamedTuple
 from typing import TYPE_CHECKING
 
-from sphinx.errors import ExtensionError
+from sphinx.errors import ExtensionError, SphinxError
 from sphinx.locale import __
 from sphinx.util import logging
 
@@ -95,7 +95,13 @@ class EventManager:
         results = []
         listeners = sorted(self.listeners[name], key=attrgetter("priority"))
         for listener in listeners:
-            results.append(listener.handler(self.app, *args))
+            try:
+                results.append(listener.handler(self.app, *args))
+            except SphinxError:
+                raise
+            except Exception as exc:
+                raise ExtensionError(__("Handler %r for event %r threw an exception") %
+                                     (listener.handler, name)) from exc
         return results
 
     def emit_firstresult(self, name: str, *args: Any) -> Any: