diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12da111a..2073564c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -444,7 +444,6 @@ def main():
 
                 except Exception as e:
                     if (args.verbosity == logging.DEBUG):
-                        logger.critical('Internal failure: %r', e, exc_info=True)
                         raise
                     logger.warning(
                         'Caught exception "%s". Reloading.', e)
diff --git a/pelican/log.py b/pelican/log.py
index cd750927..c83c5810 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -149,7 +149,7 @@ class SafeLogger(logging.Logger):
         so convert the message to unicode with the correct encoding
         '''
         if isinstance(arg, Exception):
-            text = str(arg)
+            text = '%s: %s' % (arg.__class__.__name__, arg)
             if six.PY2:
                 text = text.decode(self._exc_encoding)
             return text