diff --git a/dom0/qvm-tools/qvm-run b/dom0/qvm-tools/qvm-run
index 8292e0cd..6ed9f747 100755
--- a/dom0/qvm-tools/qvm-run
+++ b/dom0/qvm-tools/qvm-run
@@ -91,8 +91,8 @@ def vm_run_cmd(vm, cmd, options):
         if options.tray:
             tray_notify_error(str(err))
             notify_error_qubes_manager(vm.name, str(err))
-        print >> sys.stderr, "ERROR: %s" % str(err)
-        exit(1)
+        print >> sys.stderr, "ERROR(%s): %s" % (str(vm.name), str(err))
+        return 1
 
 def main():
     usage = "usage: %prog [options] [<vm-name>] [<cmd>]"