diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 4f2e08b01a..e58b1418eb 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -1729,14 +1729,16 @@ def xm_uptime(args):
         if k in ['-s', '--short']:
             short_mode = 1
 
-    doms = getDomains(params, 'running')
+    doms = getDomains(params, 'all')
 
     if short_mode == 0:
         print '%-33s %4s %s ' % ('Name','ID','Uptime')
 
     for dom in doms:
         d = parse_doms_info(dom)
-        if int(d['domid']) > 0:
+        if d['domid'] == '':
+            uptime = 0
+        elif int(d['domid']) > 0:
             uptime = int(round(d['up_time']))
         else:
             f=open('/proc/uptime', 'r')