diff --git a/backup-partition.rsc b/backup-partition.rsc
index 88ab3b60..c2221d2c 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -32,13 +32,12 @@
 
     :global LogPrint;
 
-    :onerror Err {
+    :do {
       /partitions/copy-to $FallbackTo;
       $LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackToName . "'.");
       :return true;
-    } do={
-      $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . \
-          $FallbackToName . "': " . $Err);
+    } on-error={
+      $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . $FallbackToName . "'!");
       :return false;
     }
   }
@@ -108,17 +107,16 @@
     }
   }
 
-  :onerror Err {
+  :do {
     /system/scheduler/add start-time=startup name="running-from-backup-partition" \
         on-event=(":log warning (\"Running from partition '\" . " . \
         "[ /partitions/get [ find where running ] name ] . \"'!\")");
     /partitions/save-config-to $FallbackTo;
     /system/scheduler/remove "running-from-backup-partition";
     $LogPrint info $ScriptName ("Saved configuration to partition '" . $FallbackToName . "'.");
-  } do={
+  } on-error={
     /system/scheduler/remove [ find where name="running-from-backup-partition" ];
-    $LogPrint error $ScriptName ("Failed saving configuration to partition '" . \
-        $FallbackToName . "': " . $Err);
+    $LogPrint error $ScriptName ("Failed saving configuration to partition '" . $FallbackToName . "'!");
     :set PackagesUpdateBackupFailure true;
     :set ExitOK true;
     :error false;
diff --git a/backup-upload.rsc b/backup-upload.rsc
index e6b9f92f..11ced4ca 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -90,13 +90,13 @@
     /system/backup/save encryption=aes-sha256 name=$FilePath password=$BackupPassword;
     $WaitForFile ($FilePath . ".backup");
 
-    :onerror Err {
+    :do {
       /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".backup") \
           user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".backup");
       :set BackupFile [ /file/get ($FilePath . ".backup") ];
       :set ($BackupFile->"name") ($FileName . ".backup");
-    } do={
-      $LogPrint error $ScriptName ("Uploading backup file failed: " . $Err);
+    } on-error={
+      $LogPrint error $ScriptName ("Uploading backup file failed!");
       :set BackupFile "failed";
       :set Failed 1;
     }
@@ -109,13 +109,13 @@
     /export terse show-sensitive file=$FilePath;
     $WaitForFile ($FilePath . ".rsc");
 
-    :onerror Err {
+    :do {
       /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".rsc") \
           user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".rsc");
       :set ExportFile [ /file/get ($FilePath . ".rsc") ];
       :set ($ExportFile->"name") ($FileName . ".rsc");
-    } do={
-      $LogPrint error $ScriptName ("Uploading configuration export failed: " . $Err);
+    } on-error={
+      $LogPrint error $ScriptName ("Uploading configuration export failed!");
       :set ExportFile "failed";
       :set Failed 1;
     }
@@ -130,13 +130,13 @@
         file=($FilePath . ".conf\00");
     $WaitForFile ($FilePath . ".conf");
 
-    :onerror Err {
+    :do {
       /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".conf") \
           user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".conf");
       :set ConfigFile [ /file/get ($FilePath . ".conf") ];
       :set ($ConfigFile->"name") ($FileName . ".conf");
-    } do={
-      $LogPrint error $ScriptName ("Uploading global-config-overlay failed: " . $Err);
+    } on-error={
+      $LogPrint error $ScriptName ("Uploading global-config-overlay failed!");
       :set ConfigFile "failed";
       :set Failed 1;
     }