Merge branch '3.x'

1 files changed, 3 insertions, 1 deletions

diff --git a/sphinx/events.py b/sphinx/events.py
index a29d551b7..881882b41 100644
--- a/sphinx/events.py
+++ b/sphinx/events.py
@@ -17,6 +17,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, List, NamedTuple, Tuple,
 from sphinx.errors import ExtensionError, SphinxError
 from sphinx.locale import __
 from sphinx.util import logging
+from sphinx.util.inspect import safe_getattr
 
 if TYPE_CHECKING:
     from sphinx.application import Sphinx
@@ -104,8 +105,9 @@ class EventManager:
             except SphinxError:
                 raise
             except Exception as exc:
+                modname = safe_getattr(listener.handler, '__module__', None)
                 raise ExtensionError(__("Handler %r for event %r threw an exception") %
-                                     (listener.handler, name), exc) from exc
+                                     (listener.handler, name), exc, modname=modname) from exc
         return results
 
     def emit_firstresult(self, name: str, *args: Any,