diff --git a/Lib/traceback.py b/Lib/traceback.py
index 454eb1b..56a87dc 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -158,8 +158,12 @@
     """
     list = []
     if (type(etype) == types.ClassType
-        or (isinstance(etype, type) and issubclass(etype, Exception))):
+        or (isinstance(etype, type) and issubclass(etype, BaseException))):
         stype = etype.__name__
+        if not hasattr(etype, '__module__'):
+            stype = '<unknown>.' + stype
+        elif etype.__module__ != 'exceptions':
+            stype = etype.__module__ + '.' + stype
     else:
         stype = etype
     if value is None: