diff --git a/econtext/core.py b/econtext/core.py
index 0e57f91d..35821505 100644
--- a/econtext/core.py
+++ b/econtext/core.py
@@ -856,7 +856,7 @@ class ExternalContext(object):
                 self.broker.register(self.context)
                 self._dispatch_calls()
                 LOG.debug('ExternalContext.main() normal exit')
-            except Exception:
+            except BaseException:
                 LOG.exception('ExternalContext.main() crashed')
                 raise
         finally:
diff --git a/econtext/master.py b/econtext/master.py
index 9bb3f11b..6eee353f 100644
--- a/econtext/master.py
+++ b/econtext/master.py
@@ -156,8 +156,9 @@ class ModuleResponder(object):
         pkg_path = os.path.dirname(pkg.__file__)
         try:
             fp, path, ext = imp.find_module(modname, [pkg_path])
+            LOG.error('%r', (fp, path, ext))
             return path, fp.read(), False
-        except ImportError:
+        except ImportError, e:
             LOG.debug('imp.find_module(%r, %r) -> %s', modname, [pkg_path], e)
 
     get_module_methods = [_get_module_via_pkgutil,