diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
index a4f9c447d2..3408bb40cc 100644
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c
@@ -553,9 +553,9 @@ static void net_tx_action(unsigned long unused)
 
 		/* No crossing a page as the payload mustn't fragment. */
 		if (unlikely((txreq.offset + txreq.size) >= PAGE_SIZE)) {
-			DPRINTK("txreq.addr: %lx, size: %u, end: %lu\n", 
-				txreq.addr, txreq.size, 
-				(txreq.addr &~PAGE_MASK) + txreq.size);
+			DPRINTK("txreq.offset: %x, size: %u, end: %lu\n", 
+				txreq.offset, txreq.size, 
+				(txreq.offset &~PAGE_MASK) + txreq.size);
 			make_tx_response(netif, txreq.id, NETIF_RSP_ERROR);
 			netif_put(netif);
 			continue;
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 10b70f1470..b7fa555eb2 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -32,6 +32,7 @@ import warnings
 warnings.filterwarnings('ignore', category=FutureWarning)
 
 import xen.xend.XendError
+import xen.xend.XendProtocol
 
 from xen.xend import PrettyPrint
 from xen.xend import sxp
@@ -710,6 +711,14 @@ def main(argv=sys.argv):
                 print
                 print "Please report to xen-devel@lists.xensource.com"
                 raise
+        except xen.xend.XendProtocol.XendError, ex:
+            if len(args) > 0:
+                handle_xend_error(argv[1], args[0], ex)
+            else:
+                print "Unexpected error:", sys.exc_info()[0]
+                print
+                print "Please report to xen-devel@lists.xensource.com"
+                raise
         except SystemExit:
             sys.exit(1)
         except: