diff --git a/system/src/Grav/Console/Cli/SafeUpgradeRunCommand.php b/system/src/Grav/Console/Cli/SafeUpgradeRunCommand.php
index 7fab957c7..91a8aae11 100644
--- a/system/src/Grav/Console/Cli/SafeUpgradeRunCommand.php
+++ b/system/src/Grav/Console/Cli/SafeUpgradeRunCommand.php
@@ -75,17 +75,14 @@ class SafeUpgradeRunCommand extends GravCommand
 
         try {
             $result = $manager->run($options);
-            $manager->updateJob([
-                'result' => $result,
-            ]);
+            $manager->ensureJobResult($result);
 
             return ($result['status'] ?? null) === 'success' ? 0 : 1;
         } catch (Throwable $e) {
-            $manager->updateJob([
+            $manager->ensureJobResult([
                 'status' => 'error',
-                'error' => $e->getMessage(),
+                'message' => $e->getMessage(),
             ]);
-            $manager->markJobError($e->getMessage());
             $io->error($e->getMessage());
 
             return 1;