diff -uNrp xen.orig/xend/server/SrvBase.py xen/xend/server/SrvBase.py
--- xen.orig/xend/server/SrvBase.py	2005-04-03 05:06:32.000000000 +0200
+++ xen/xend/server/SrvBase.py	2005-06-07 00:44:39.000000000 +0200
@@ -106,8 +106,7 @@ class SrvBase(resource.Resource):
         try:
             val = op_method(op, req)
         except Exception, err:
-            self._perform_err(err, op, req)
-            return ''
+            return self._perform_err(err, op, req)
             
         if isinstance(val, defer.Deferred):
             val.addCallback(self._perform_cb, op, req, dfr=1)
diff -uNrp xen.orig/xend/server/SrvConsoleDir.py xen/xend/server/SrvConsoleDir.py
--- xen.orig/xend/server/SrvConsoleDir.py	2005-04-03 05:06:29.000000000 +0200
+++ xen/xend/server/SrvConsoleDir.py	2005-06-07 00:44:39.000000000 +0200
@@ -44,7 +44,7 @@ class SrvConsoleDir(SrvDir):
                 req.write("</body></html>")
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "ls_console", req)
 
     def ls_console(self, req, use_sxp=0):
         url = req.prePathURL()
diff -uNrp xen.orig/xend/server/SrvConsole.py xen/xend/server/SrvConsole.py
--- xen.orig/xend/server/SrvConsole.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvConsole.py	2005-06-07 00:44:39.000000000 +0200
@@ -34,7 +34,7 @@ class SrvConsole(SrvDir):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "console", req)
 
     def form(self, req):
         req.write('<form method="post" action="%s">' % req.prePathURL())
diff -uNrp xen.orig/xend/server/SrvDir.py xen/xend/server/SrvDir.py
--- xen.orig/xend/server/SrvDir.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvDir.py	2005-06-07 00:44:39.000000000 +0200
@@ -92,7 +92,7 @@ class SrvDir(SrvBase):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, "GET", req)
+            self._perform_err(ex, "ls", req)
             
     def ls(self, req, use_sxp=0):
         url = req.prePathURL()
diff -uNrp xen.orig/xend/server/SrvDmesg.py xen/xend/server/SrvDmesg.py
--- xen.orig/xend/server/SrvDmesg.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvDmesg.py	2005-06-07 00:44:39.000000000 +0200
@@ -29,7 +29,7 @@ class SrvDmesg(SrvDir):
                 req.write('</pre></body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "dmesg", req)
             
     def info(self):
         return self.xd.info()
diff -uNrp xen.orig/xend/server/SrvDomainDir.py xen/xend/server/SrvDomainDir.py
--- xen.orig/xend/server/SrvDomainDir.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvDomainDir.py	2005-06-07 00:44:39.000000000 +0200
@@ -131,7 +131,7 @@ class SrvDomainDir(SrvDir):
                 req.write("</body></html>")
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "ls_domain", req)
 
     def ls_domain(self, req, use_sxp=0):
         url = req.prePathURL()
diff -uNrp xen.orig/xend/server/SrvNode.py xen/xend/server/SrvNode.py
--- xen.orig/xend/server/SrvNode.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvNode.py	2005-06-07 00:44:39.000000000 +0200
@@ -58,7 +58,7 @@ class SrvNode(SrvDir):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "node info", req)
             
     def info(self):
         return self.xn.info()
diff -uNrp xen.orig/xend/server/SrvVnetDir.py xen/xend/server/SrvVnetDir.py
--- xen.orig/xend/server/SrvVnetDir.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvVnetDir.py	2005-06-07 00:44:39.000000000 +0200
@@ -84,7 +84,7 @@ class SrvVnetDir(SrvDir):
                 req.write("</body></html>")
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "ls_vnet", req)
 
     def ls_vnet(self, req, use_sxp=0):
         url = req.prePathURL()
diff -uNrp xen.orig/xend/server/SrvXendLog.py xen/xend/server/SrvXendLog.py
--- xen.orig/xend/server/SrvXendLog.py	2005-04-04 00:07:05.000000000 +0200
+++ xen/xend/server/SrvXendLog.py	2005-06-07 00:44:39.000000000 +0200
@@ -22,4 +22,4 @@ class SrvXendLog(SrvDir):
         try:
             return self.logfile.render(req)
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "log", req)