diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 6c3bdbae..f23a996d 100755
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -35,7 +35,7 @@ my $nodename = PVE::INotify::nodename();
 my $upid_exit = sub {
     my $upid = shift;
     my $status = PVE::Tools::upid_read_status($upid);
-    exit($status eq 'OK' ? 0 : -1);
+    exit(PVE::Tools::upid_status_is_error($status) ? -1 : 0);
 };
 
 sub setup_environment {
diff --git a/PVE/CLI/pvenode.pm b/PVE/CLI/pvenode.pm
index a33fcd93..acd573f0 100644
--- a/PVE/CLI/pvenode.pm
+++ b/PVE/CLI/pvenode.pm
@@ -36,7 +36,7 @@ my $upid_exit = sub {
     my $upid = shift;
     my $status = PVE::Tools::upid_read_status($upid);
     print "Task $status\n";
-    exit($status eq 'OK' ? 0 : -1);
+    exit(PVE::Tools::upid_status_is_error($status) ? -1 : 0);
 };
 
 sub param_mapping {
diff --git a/PVE/CLI/vzdump.pm b/PVE/CLI/vzdump.pm
index fe5fd049..3f625574 100755
--- a/PVE/CLI/vzdump.pm
+++ b/PVE/CLI/vzdump.pm
@@ -19,7 +19,7 @@ our $cmddef = [ 'PVE::API2::VZDump', 'vzdump', 'vmid', undef,
 		    my $upid = shift;
 		    exit(0) if $upid eq 'OK';
 		    my $status = PVE::Tools::upid_read_status($upid);
-		    exit($status eq 'OK' ? 0 : -1);
+		    exit(PVE::Tools::upid_status_is_error($status) ? -1 : 0);
 		}];
 
 1;