Index: package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2693)
+++ package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2694)
@@ -77,5 +77,5 @@
         d = dict(op = op, user=username, fields=cherrypy.request.prev.params,
                  errorMessage=str(err), stderr=emsg, traceback=traceback)
-        error_raw = cherrypy.tools.mako.callable.get_lookup(**cherrypy.tools.mako._merged_args()).get_template("/error_raw.mako")
+        error_raw = cherrypy.request.lookup.get_template("/error_raw.mako")
         details = error_raw.render(**d)
         exclude = config.web.errormail_exclude
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/error.mako
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/error.mako	(revision 2693)
+++ package_branches/invirt-web/cherrypy-rebased/code/templates/error.mako	(revision 2694)
@@ -9,5 +9,5 @@
 mail about it.</p>
 
-<p>Feel free to poke us at <tt>xvm@mit.edu</tt> if this bug is
+<p>Feel free to poke us at <tt>${config.contact}</tt> if this bug is
 consistently biting you and we don't seem to be fixing it.</p>