From d4547ecbfac2e5b3caf512282c4ea0fb028d05cc Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 14:57:52 +0100
Subject: [PATCH 01/36] backup-cloud: early exit with :exit

---
 backup-cloud.rsc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index b4925f33..babf2b9a 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -9,7 +9,6 @@
 # upload backup to MikroTik cloud
 # https://rsc.eworm.de/doc/backup-cloud.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -36,15 +35,13 @@
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
     $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -55,8 +52,7 @@
 
   :if ([ $MkDir ("tmpfs/backup-cloud") ] = false) do={
     $LogPrint error $ScriptName ("Failed creating directory!");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local I 5;
@@ -100,5 +96,5 @@
   }
   $RmDir "tmpfs/backup-cloud";
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 3ad7b5f2bb4faa49b2febc1673feb29bcc733756 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 14:59:06 +0100
Subject: [PATCH 02/36] backup-email: early exit with :exit

---
 backup-email.rsc | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/backup-email.rsc b/backup-email.rsc
index fcafff45..b6c26680 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -9,7 +9,6 @@
 # create and email backup and config file
 # https://rsc.eworm.de/doc/backup-email.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -41,28 +40,24 @@
 
   :if ([ :typeof $SendEMail2 ] = "nothing") do={
     $LogPrint error $ScriptName ("The module for sending notifications via e-mail is not installed.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ($BackupSendBinary != true && \
        $BackupSendExport != true) do={
     $LogPrint error $ScriptName ("Configured to send neither backup nor config export.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
     $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -82,8 +77,7 @@
 
   :if ([ $MkDir $DirName ] = false) do={
     $LogPrint error $ScriptName ("Failed creating directory!");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   # binary backup
@@ -139,5 +133,5 @@
   }
   # do not remove the files here, as the mail is still queued!
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 6f1f60a82bfbe919e2cbcbdc1ba0e7ed013d3e3d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:00:40 +0100
Subject: [PATCH 03/36] backup-partition: early exit with :exit

---
 backup-partition.rsc | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/backup-partition.rsc b/backup-partition.rsc
index 78f4cce1..6f3a84ec 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -10,7 +10,6 @@
 # save configuration to fallback partition
 # https://rsc.eworm.de/doc/backup-partition.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -45,22 +44,19 @@
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
     $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /partitions/find ] ] < 2) do={
     $LogPrint error $ScriptName ("Device does not have a fallback partition.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local ActiveRunning [ /partitions/find where active running ];
@@ -68,8 +64,7 @@
   :if ([ :len $ActiveRunning ] < 1) do={
     $LogPrint error $ScriptName ("Device is not running from active partition.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local FallbackToName [ /partitions/get $ActiveRunning fallback-to ];
@@ -78,8 +73,7 @@
   :if ([ :len $FallbackTo ] < 1) do={
     $LogPrint error $ScriptName ("There is no inactive partition named '" . $FallbackToName . "'.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ /partitions/get $ActiveRunning version ] != [ /partitions/get $FallbackTo version]) do={
@@ -88,8 +82,7 @@
       :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
         :if ([ $CopyTo $ScriptName $FallbackTo $FallbackToName ] = false) do={
           :set PackagesUpdateBackupFailure true;
-          :set ExitOK true;
-          :error false;
+          :exit;
         }
       }
     } else={
@@ -101,8 +94,7 @@
            ($NumInstalled & $BitMask) != ($NumLatest & $BitMask)) do={
         :if ([ $CopyTo $ScriptName $FallbackTo $FallbackToName ] = false) do={
           :set PackagesUpdateBackupFailure true;
-          :set ExitOK true;
-          :error false;
+          :exit;
         }
       }
     }
@@ -120,9 +112,8 @@
     $LogPrint error $ScriptName ("Failed saving configuration to partition '" . \
         $FallbackToName . "': " . $Err);
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 98bd011984d42c525951bd0fe30bbb0159ba3177 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:01:49 +0100
Subject: [PATCH 04/36] backup-upload: early exit with :exit

---
 backup-upload.rsc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/backup-upload.rsc b/backup-upload.rsc
index bded570c..189d9d88 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -10,7 +10,6 @@
 # create and upload backup and config file
 # https://rsc.eworm.de/doc/backup-upload.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -47,21 +46,18 @@
   :if ($BackupSendBinary != true && \
        $BackupSendExport != true) do={
     $LogPrint error $ScriptName ("Configured to send neither backup nor config export.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
     $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
     :set PackagesUpdateBackupFailure true;
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -81,8 +77,7 @@
 
   :if ([ $MkDir $DirName ] = false) do={
     $LogPrint error $ScriptName ("Failed creating directory!");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   # binary backup
@@ -174,5 +169,5 @@
   }
   $RmDir $DirName;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 85965a6dee442c19671e720847489fdd4c5b7f6e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:02:56 +0100
Subject: [PATCH 05/36] capsman-download-packages: early exit with :exit

---
 capsman-download-packages.capsman.rsc  | 12 ++++--------
 capsman-download-packages.template.rsc | 12 ++++--------
 capsman-download-packages.wifi.rsc     | 12 ++++--------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index 8cedf01b..be09795d 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -28,8 +27,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -39,16 +37,14 @@
 
   :if ([ :len $PackagePath ] = 0) do={
     $LogPrint warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ $FileGet $PackagePath ] = false) do={
     :if ([ $MkDir $PackagePath ] = false) do={
       $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
         $PackagePath . ") failed!");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
     $LogPrint info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
       "). Please place your packages!");
@@ -89,5 +85,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index ffb622ba..14a45962 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -12,7 +12,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -29,8 +28,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -41,16 +39,14 @@
 
   :if ([ :len $PackagePath ] = 0) do={
     $LogPrint warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ $FileGet $PackagePath ] = false) do={
     :if ([ $MkDir $PackagePath ] = false) do={
       $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
         $PackagePath . ") failed!");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
     $LogPrint info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
       "). Please place your packages!");
@@ -100,5 +96,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 1aefee63..6b1da82f 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -28,8 +27,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -39,16 +37,14 @@
 
   :if ([ :len $PackagePath ] = 0) do={
     $LogPrint warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ $FileGet $PackagePath ] = false) do={
     :if ([ $MkDir $PackagePath ] = false) do={
       $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
         $PackagePath . ") failed!");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
     $LogPrint info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
       "). Please place your packages!");
@@ -91,5 +87,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 9851ffb927ae4d1d5b0a6d70174fc0d300639be3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:03:44 +0100
Subject: [PATCH 06/36] capsman-rolling-upgrade: early exit with :exit

---
 capsman-rolling-upgrade.capsman.rsc  | 6 ++----
 capsman-rolling-upgrade.template.rsc | 6 ++----
 capsman-rolling-upgrade.wifi.rsc     | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index caa768d8..08cadf60 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -12,7 +12,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -23,8 +22,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
@@ -46,5 +44,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index d38cdda9..d10448ed 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -13,7 +13,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -24,8 +23,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
@@ -54,5 +52,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index 330ec04d..92541471 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -12,7 +12,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -23,8 +22,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local InstalledVersion [ /system/package/update/get installed-version ];
@@ -47,5 +45,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From d9f5105b028fdc6975a28160b3aee1f133f32a78 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:04:38 +0100
Subject: [PATCH 07/36] certificate-renew-issued: early exit with :exit

---
 certificate-renew-issued.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
index e78669f4..9c22468d 100644
--- a/certificate-renew-issued.rsc
+++ b/certificate-renew-issued.rsc
@@ -8,7 +8,6 @@
 # renew locally issued certificates
 # https://rsc.eworm.de/doc/certificate-renew-issued.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -22,8 +21,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Cert in=[ /certificate/find where issued expires-after<3w ] do={
@@ -48,5 +46,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From d8980ffc1170cdbbd77cafadbc8f173e9f5be8ed Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:05:17 +0100
Subject: [PATCH 08/36] check-certificates: early exit with :exit

---
 check-certificates.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/check-certificates.rsc b/check-certificates.rsc
index 99253c85..ef5679ce 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -9,7 +9,6 @@
 # check for certificate validity
 # https://rsc.eworm.de/doc/check-certificates.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -150,8 +149,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -250,5 +248,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 9f7ec88f3ddb69141fe31ca1275bd12bb0feadac Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:06:07 +0100
Subject: [PATCH 09/36] check-health: early exit with :exit

---
 check-health.rsc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/check-health.rsc b/check-health.rsc
index 51438966..793afd3a 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -8,7 +8,6 @@
 # check for RouterOS health state
 # https://rsc.eworm.de/doc/check-health.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -37,8 +36,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Resource [ /system/resource/get ];
@@ -77,8 +75,7 @@
   :local Plugins [ /system/script/find where name~"^check-health\\.d/." ];
   :if ([ :len $Plugins ] = 0) do={
     $LogPrint debug $ScriptName ("No plugins installed.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :global CheckHealthPlugins ({});
@@ -106,5 +103,5 @@
 
   :set CheckHealthPlugins;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 9e1e6c8a93c9bdfe3f67abc042f359324a6af5d1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:06:43 +0100
Subject: [PATCH 10/36] check-lte-firmware-upgrade: early exit with :exit

---
 check-lte-firmware-upgrade.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
index 2087075e..7acef442 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -8,7 +8,6 @@
 # check for LTE firmware upgrade, send notification
 # https://rsc.eworm.de/doc/check-lte-firmware-upgrade.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -20,8 +19,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $SentLteFirmwareUpgradeNotification ] != "array") do={
@@ -103,5 +101,5 @@
     $CheckInterface $ScriptName $Interface;
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From f3e2693b5c011c85beaba6c7750e108f18fd740f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:07:40 +0100
Subject: [PATCH 11/36] check-perpetual-license: early exit with :exit

---
 check-perpetual-license.rsc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
index 21d63cad..849843fd 100644
--- a/check-perpetual-license.rsc
+++ b/check-perpetual-license.rsc
@@ -8,7 +8,6 @@
 # check perpetual license on CHR
 # https://rsc.eworm.de/doc/check-perpetual-license.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -25,8 +24,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -34,8 +32,7 @@
   :local License [ /system/license/get ];
   :if ([ :typeof ($License->"deadline-at") ] != "str") do={
     $LogPrint info $ScriptName ("This device does not have a perpetual license.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
   
   :if ([ :len ($License->"next-renewal-at") ] = 0 && ($License->"limited-upgrades") = true) do={
@@ -47,8 +44,7 @@
           ", can no longer update RouterOS on " . $Identity . "...") });
       :set SentCertificateNotification "expired";
     }
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :if ([ :totime ($License->"deadline-at") ] - 3w < [ :timestamp ]) do={
@@ -60,8 +56,7 @@
           ($License->"deadline-at") . " on " . $Identity . "...") });
       :set SentCertificateNotification "warning";
     }
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :if ([ :typeof $SentCertificateNotification ] = "str" && \
@@ -74,5 +69,5 @@
     :set SentCertificateNotification;
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 4e21fde427406c492e91fb8aa557dc1688802b28 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:09:25 +0100
Subject: [PATCH 12/36] check-routeros-update: early exit with :exit

---
 check-routeros-update.rsc | 45 +++++++++++++--------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index bf3acd98..1fe22770 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -9,7 +9,6 @@
 # check for RouterOS update, send notification and/or install
 # https://rsc.eworm.de/doc/check-routeros-update.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -47,14 +46,12 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
     $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -65,8 +62,7 @@
       /system/scheduler/remove "_RebootForUpdate";
     } else={
       $LogPrint info $ScriptName ("A reboot for update is already scheduled.");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
   }
 
@@ -78,14 +74,12 @@
     :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
       $LogPrint info $ScriptName ("System is already up to date.");
     }
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :if ([ :len ($Update->"latest-version") ] = 0) do={
     $LogPrint info $ScriptName ("Received an empty version string from server.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
@@ -97,8 +91,7 @@
 
   :if ($NumLatest < [ $VersionToNum "7.0" ]) do={
     $LogPrint warning $ScriptName ("The version '" . ($Update->"latest-version") . "' is not a valid version.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ($NumInstalled < $NumLatest) do={
@@ -110,8 +103,7 @@
         message=("Installing ALL versions automatically, including " . $Update->"latest-version" . \
           "... Updating on " . $Identity . "..."); link=$Link; silent=true });
       $DoUpdate $ScriptName;
-      :set ExitOK true;
-      :error true;
+      :exit;
     }
 
     :if ($SafeUpdatePatch = true && $NumInstalledFeature = $NumLatestFeature) do={
@@ -121,8 +113,7 @@
         message=("Version " . $Update->"latest-version" . " is a patch update for " . $Update->"channel" . \
           ", updating on " . $Identity . "..."); link=$Link; silent=true });
       $DoUpdate $ScriptName;
-      :set ExitOK true;
-      :error true;
+      :exit;
     }
 
     :if ($SafeUpdateNeighbor = true) do={
@@ -137,8 +128,7 @@
           message=("Seen a neighbor (" . $Neighbor . ") running version " . $Update->"latest-version" . \
             " from " . $Update->"channel" . ", updating on " . $Identity . "..."); link=$Link; silent=true });
         $DoUpdate $ScriptName;
-        :set ExitOK true;
-        :error true;
+        :exit;
       }
     }
 
@@ -159,8 +149,7 @@
           message=("Version " . $Update->"latest-version" . " is considered safe for " . $Update->"channel" . \
             ", updating on " . $Identity . "..."); link=$Link; silent=true });
         $DoUpdate $ScriptName;
-        :set ExitOK true;
-        :error true;
+        :exit;
       }
     }
 
@@ -170,16 +159,14 @@
         :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
           /system/package/update/set channel=stable;
           $LogPrint info $ScriptName ("Switched to channel 'stable', please re-run!");
-          :set ExitOK true;
-          :error true;
+          :exit;
         }
       }
 
       :put ("Do you want to install RouterOS version " . $Update->"latest-version" . "? [y/N]");
       :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
         $DoUpdate $ScriptName;
-        :set ExitOK true;
-        :error true;
+        :exit;
       } else={
         :put "Canceled...";
       }
@@ -188,8 +175,7 @@
     :if ($SentRouterosUpdateNotification = $Update->"latest-version") do={
       $LogPrint info $ScriptName ("Already sent the RouterOS update notification for version " . \
           $Update->"latest-version" . ".");
-      :set ExitOK true;
-      :error true;
+      :exit;
     }
 
     $SendNotification2 ({ origin=$ScriptName; \
@@ -204,8 +190,7 @@
     :if ($SentRouterosUpdateNotification = $Update->"latest-version") do={
       $LogPrint info $ScriptName ("Already sent the RouterOS downgrade notification for version " . \
           $Update->"latest-version" . ".");
-      :set ExitOK true;
-      :error true;
+      :exit;
     }
 
     $SendNotification2 ({ origin=$ScriptName; \
@@ -218,5 +203,5 @@
     :set SentRouterosUpdateNotification ($Update->"latest-version");
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From c588473f87519545cf16b512508a852da5edbe7e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:10:22 +0100
Subject: [PATCH 13/36] collect-wireless-mac: early exit with :exit

---
 collect-wireless-mac.capsman.rsc  | 6 ++----
 collect-wireless-mac.local.rsc    | 6 ++----
 collect-wireless-mac.template.rsc | 6 ++----
 collect-wireless-mac.wifi.rsc     | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
index 8bb33d87..0231edba 100644
--- a/collect-wireless-mac.capsman.rsc
+++ b/collect-wireless-mac.capsman.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -30,8 +29,7 @@
   :global SymbolForNotification;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@@ -96,5 +94,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index 9d41d420..a799b418 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -30,8 +29,7 @@
   :global SymbolForNotification;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@@ -97,5 +95,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index 837726e3..2d6eed0c 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -12,7 +12,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -31,8 +30,7 @@
   :global SymbolForNotification;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@@ -114,5 +112,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
index d07ff357..1636ddcc 100644
--- a/collect-wireless-mac.wifi.rsc
+++ b/collect-wireless-mac.wifi.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -30,8 +29,7 @@
   :global SymbolForNotification;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /interface/wifi/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@@ -96,5 +94,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From b9a3dba2a0f5975805832cc385ece250892e1b6e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:11:17 +0100
Subject: [PATCH 14/36] daily-psk: early exit with :exit

---
 daily-psk.capsman.rsc  | 6 ++----
 daily-psk.local.rsc    | 6 ++----
 daily-psk.template.rsc | 6 ++----
 daily-psk.wifi.rsc     | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 2cee46ed..2892b886 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -32,8 +31,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -92,5 +90,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index fbf6dafe..cc7d45d9 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -32,8 +31,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -91,5 +89,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 81244b86..1b408aae 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -12,7 +12,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -33,8 +32,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -107,5 +105,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 636e9f43..0bc54422 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -32,8 +31,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -92,5 +90,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 98f50ab2936989ed6bf658a29f678b99da55f82a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:11:57 +0100
Subject: [PATCH 15/36] dhcp-lease-comment: early exit with :exit

---
 dhcp-lease-comment.capsman.rsc  | 6 ++----
 dhcp-lease-comment.local.rsc    | 6 ++----
 dhcp-lease-comment.template.rsc | 6 ++----
 dhcp-lease-comment.wifi.rsc     | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
index 7fd00a09..a069e9db 100644
--- a/dhcp-lease-comment.capsman.rsc
+++ b/dhcp-lease-comment.capsman.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -22,8 +21,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
@@ -39,5 +37,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
index 7ed6823a..cffe22b9 100644
--- a/dhcp-lease-comment.local.rsc
+++ b/dhcp-lease-comment.local.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -22,8 +21,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
@@ -39,5 +37,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
index c901de40..1fe9a4a3 100644
--- a/dhcp-lease-comment.template.rsc
+++ b/dhcp-lease-comment.template.rsc
@@ -12,7 +12,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -23,8 +22,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
@@ -44,5 +42,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
index d481def8..41239861 100644
--- a/dhcp-lease-comment.wifi.rsc
+++ b/dhcp-lease-comment.wifi.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -22,8 +21,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic=yes status=bound ] do={
@@ -39,5 +37,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 47cd3e0d6d65382bbdd43fb8f4766ddfe8e3e9f7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:12:42 +0100
Subject: [PATCH 16/36] dhcp-to-dns: early exit with :exit

---
 dhcp-to-dns.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index 94c7492e..573336b0 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -9,7 +9,6 @@
 # check DHCP leases and add/remove/update DNS entries
 # https://rsc.eworm.de/doc/dhcp-to-dns.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -28,8 +27,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Ttl 5m;
@@ -126,5 +124,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 3bad246473ce4e1b2f23a2f93e1df33118aef73d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:13:25 +0100
Subject: [PATCH 17/36] firmware-upgrade-reboot: early exit with :exit

---
 firmware-upgrade-reboot.rsc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
index 7c64909d..10df1a47 100644
--- a/firmware-upgrade-reboot.rsc
+++ b/firmware-upgrade-reboot.rsc
@@ -8,7 +8,6 @@
 # install firmware upgrade, and reboot
 # https://rsc.eworm.de/doc/firmware-upgrade-reboot.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -20,21 +19,18 @@
   :global VersionToNum;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local RouterBoard [ /system/routerboard/get ];
   :if ($RouterBoard->"current-firmware" = $RouterBoard->"upgrade-firmware") do={
     $LogPrint info $ScriptName ("Current and upgrade firmware match with version " . \
       $RouterBoard->"current-firmware" . ".");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
   :if ([ $VersionToNum ($RouterBoard->"current-firmware") ] > [ $VersionToNum ($RouterBoard->"upgrade-firmware") ]) do={
     $LogPrint info $ScriptName ("Different firmware version is available, but it is a downgrade. Ignoring.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :if ([ /system/routerboard/settings/get auto-upgrade ] = false) do={
@@ -56,5 +52,5 @@
   $LogPrint info $ScriptName ("Firmware upgrade successful, rebooting.");
   /system/reboot;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From df4c2b84d9c507a9825ba9acb10eb13e52f6a46e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:14:54 +0100
Subject: [PATCH 18/36] fw-addr-lists: early exit with :exit

---
 fw-addr-lists.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index ac15c652..5f2dd972 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -8,7 +8,6 @@
 # download, import and update firewall address-lists
 # https://rsc.eworm.de/doc/fw-addr-lists.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -46,8 +45,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -232,5 +230,5 @@
         " - removed: " . [ $HumanReadableNum $CntRemove 1000 ]);
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From a78ca1019770c26eda648b5fad80e1c473683442 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:14:06 +0100
Subject: [PATCH 19/36] gps-track: early exit with :exit

---
 gps-track.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gps-track.rsc b/gps-track.rsc
index ce55c049..ed089405 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -9,7 +9,6 @@
 # track gps data by sending json data to http server
 # https://rsc.eworm.de/doc/gps-track.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -25,8 +24,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
   $WaitFullyConnected;
 
@@ -49,5 +47,5 @@
     $LogPrint debug $ScriptName ("GPS data not valid.");
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 12c0ef43e138badbbea79f14347920d3030f5829 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:16:29 +0100
Subject: [PATCH 20/36] hotspot-to-wpa: early exit with :exit

---
 hotspot-to-wpa.capsman.rsc  | 12 ++++--------
 hotspot-to-wpa.template.rsc | 12 ++++--------
 hotspot-to-wpa.wifi.rsc     | 12 ++++--------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc
index 60945a1a..b976c356 100644
--- a/hotspot-to-wpa.capsman.rsc
+++ b/hotspot-to-wpa.capsman.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -27,14 +26,12 @@
   :local UserName $username;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $MacAddress ] = "nothing" || [ :typeof $UserName ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from hotspot on login.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Date [ /system/clock/get date ];
@@ -61,8 +58,7 @@
 
   :if ($Template->"action" = "reject") do={
     $LogPrint info $ScriptName ("Ignoring login for hotspot '" . $Hotspot . "'.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   # allow login page to load
@@ -101,5 +97,5 @@
   :delay 2s;
   /caps-man/access-list/set $Entry action=accept;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc
index 7c56cc10..6f75a7e6 100644
--- a/hotspot-to-wpa.template.rsc
+++ b/hotspot-to-wpa.template.rsc
@@ -12,7 +12,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -28,14 +27,12 @@
   :local UserName $username;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $MacAddress ] = "nothing" || [ :typeof $UserName ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from hotspot on login.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Date [ /system/clock/get date ];
@@ -68,8 +65,7 @@
 
   :if ($Template->"action" = "reject") do={
     $LogPrint info $ScriptName ("Ignoring login for hotspot '" . $Hotspot . "'.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   # allow login page to load
@@ -121,5 +117,5 @@
   /caps-man/access-list/set $Entry action=accept;
   /interface/wifi/access-list/set $Entry action=accept;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index 68ed4c2e..b36cefba 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -11,7 +11,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -27,14 +26,12 @@
   :local UserName $username;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $MacAddress ] = "nothing" || [ :typeof $UserName ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from hotspot on login.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Date [ /system/clock/get date ];
@@ -61,8 +58,7 @@
 
   :if ($Template->"action" = "reject") do={
     $LogPrint info $ScriptName ("Ignoring login for hotspot '" . $Hotspot . "'.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   # allow login page to load
@@ -98,5 +94,5 @@
   :delay 2s;
   /interface/wifi/access-list/set $Entry action=accept;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From e6fc8ae382bc54b02177c856a5c712e385eed189 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:17:06 +0100
Subject: [PATCH 21/36] hotspot-to-wpa-cleanup: early exit with :exit

---
 hotspot-to-wpa-cleanup.capsman.rsc  | 6 ++----
 hotspot-to-wpa-cleanup.template.rsc | 6 ++----
 hotspot-to-wpa-cleanup.wifi.rsc     | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index 35275313..2a988944 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -12,7 +12,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -25,8 +24,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local DHCPServers ({});
@@ -76,5 +74,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 398f194f..290aee52 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -13,7 +13,6 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -26,8 +25,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local DHCPServers ({});
@@ -83,5 +81,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 17b9e545..6ed60e87 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -12,7 +12,6 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -25,8 +24,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local DHCPServers ({});
@@ -76,5 +74,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From b37f47758ace7b910e4e1ae9478a182ab1ace791 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:17:52 +0100
Subject: [PATCH 22/36] ipsec-to-dns: early exit with :exit

---
 ipsec-to-dns.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index a08405fb..6296da3f 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -9,7 +9,6 @@
 # and add/remove/update DNS entries from IPSec mode-config
 # https://rsc.eworm.de/doc/ipsec-to-dns.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -28,8 +27,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Zone \
@@ -80,5 +78,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 5b667c2d0a326e8bc4608bccc1d9dd2322b4edc7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:18:44 +0100
Subject: [PATCH 23/36] ipv6-update: early exit with :exit

---
 ipv6-update.rsc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index c87410cc..7b7cc563 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -8,7 +8,6 @@
 # update firewall and dns settings on IPv6 prefix change
 # https://rsc.eworm.de/doc/ipv6-update.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -25,26 +24,22 @@
   :local PdValid $"pd-valid";
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $NaAddress ] = "str") do={
     $LogPrint info $ScriptName ("An address (" . $NaAddress . ") was acquired, not a prefix. Ignoring.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $PdPrefix ] = "nothing" || [ :typeof $PdValid ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from ipv6 dhcp-client.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ($PdValid != 1) do={
     $LogPrint info $ScriptName ("The prefix " . $PdPrefix . " is no longer valid. Ignoring.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Pool [ /ipv6/pool/get [ find where prefix=$PdPrefix ] name ];
@@ -103,5 +98,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From f94ae82e3edfa6bce57cf6a31452fefd4f3d957c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:19:58 +0100
Subject: [PATCH 24/36] lease-script: early exit with :exit

---
 lease-script.rsc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lease-script.rsc b/lease-script.rsc
index 991e6fac..af0add7a 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -8,7 +8,6 @@
 # run scripts on DHCP lease
 # https://rsc.eworm.de/doc/lease-script.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -26,22 +25,19 @@
        [ :typeof $leaseServerName ] = "nothing" || \
        [ :typeof $leaseBound ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from ip dhcp-server.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $LogPrint debug $ScriptName ("DHCP Server " . $leaseServerName . " " . [ $IfThenElse ($leaseBound = 0) \
     "de" "" ] . "assigned lease " . $leaseActIP . " to " . $leaseActMAC);
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/script/job/find where script=$ScriptName ] ] > 1) do={
     $LogPrint debug $ScriptName ("More invocations are waiting, exiting early.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :local RunOrder ({});
@@ -61,5 +57,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 394c204a4d058d5ffbf431e14ca9a7e63d278780 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:20:53 +0100
Subject: [PATCH 25/36] log-forward: early exit with :exit

---
 log-forward.rsc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/log-forward.rsc b/log-forward.rsc
index e89fdc18..6ad1d586 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -8,7 +8,6 @@
 # forward log messages via notification
 # https://rsc.eworm.de/doc/log-forward.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -33,8 +32,7 @@
   :global SymbolForNotification;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :typeof $LogForwardLast ] = "nothing") do={
@@ -48,8 +46,7 @@
   :if ($LogForwardRateLimit > 30) do={
     :set LogForwardRateLimit ($LogForwardRateLimit - 1);
     $LogPrint info $ScriptName ("Rate limit in action, not forwarding logs, if any!");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Count 0;
@@ -111,5 +108,5 @@
 
   :set LogForwardLast $Max;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From bb40c7a33d4c453101fb2e32354260287428eb22 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 15 Jan 2026 09:25:48 +0100
Subject: [PATCH 26/36] netwatch-dns: early exit with :exit

---
 netwatch-dns.rsc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 9531d4ad..50c9d57e 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -9,7 +9,6 @@
 # monitor and manage dns/doh with netwatch
 # https://rsc.eworm.de/doc/netwatch-dns.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -26,15 +25,13 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local SettleTime (5m30s - [ /system/resource/get uptime ]);
   :if ($SettleTime > 0s) do={
     $LogPrint info $ScriptName ("System just booted, giving netwatch " . $SettleTime . " to settle.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :local DnsServers ({});
@@ -89,8 +86,7 @@
 
       :if ($DohCurrent = $HostInfo->"doh-url" && [ $IsDNSResolving ] = true) do={
         $LogPrint debug $ScriptName ("Current DoH server is still up and resolving: " . $DohCurrent);
-        :set ExitOK true;
-        :error true;
+        :exit;
       }
 
       :set ($DohServers->[ :len $DohServers ]) $HostInfo;
@@ -135,8 +131,7 @@
         }
         /ip/dns/cache/flush;
         $LogPrint info $ScriptName ("Setting DoH server: " . ($DohServer->"doh-url"));
-        :set ExitOK true;
-        :error true;
+        :exit;
       } else={
         $LogPrint warning $ScriptName ("Received unexpected response from DoH server: " . \
           ($DohServer->"doh-url"));
@@ -144,5 +139,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From e2fdb76f433b0ec45621aa69ecda8567c80df78a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:21:27 +0100
Subject: [PATCH 27/36] netwatch-notify: early exit with :exit

---
 netwatch-notify.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index d9ab5446..4ed7e916 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -8,7 +8,6 @@
 # monitor netwatch and send notifications
 # https://rsc.eworm.de/doc/netwatch-notify.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -80,8 +79,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local ScriptFromTerminalCached [ $ScriptFromTerminal $ScriptName ];
@@ -225,5 +223,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From b8839ed6dfe90cb0c921277f7574315a116ca9cd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:22:02 +0100
Subject: [PATCH 28/36] ospf-to-leds: early exit with :exit

---
 ospf-to-leds.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index 784fcdd8..8b3cb920 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -8,7 +8,6 @@
 # visualize ospf instance state via leds
 # https://rsc.eworm.de/doc/ospf-to-leds.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -20,8 +19,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Instance in=[ /routing/ospf/instance/find where comment~"^ospf-to-leds," ] do={
@@ -45,5 +43,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 34ca3fd2ef22ddbb8b241391dc528450cf4683f1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:23:27 +0100
Subject: [PATCH 29/36] packages-update: early exit with :exit

---
 packages-update.rsc | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/packages-update.rsc b/packages-update.rsc
index 304a3683..75a9bfe8 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -9,7 +9,6 @@
 # download packages and reboot for installation
 # https://rsc.eworm.de/doc/packages-update.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -59,28 +58,24 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
     $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Update [ /system/package/update/get ];
 
   :if ([ :typeof ($Update->"latest-version") ] = "nothing") do={
     $LogPrint warning $ScriptName ("Latest version is not known.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ($Update->"installed-version" = $Update->"latest-version") do={
     $LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   :local RunOrder ({});
@@ -111,13 +106,11 @@
           $LogPrint info $ScriptName ("User requested to continue anyway.");
         } else={
           $LogPrint info $ScriptName ("Canceled update...");
-          :set ExitOK true;
-          :error false;
+          :exit;
         }
       } else={
         $LogPrint warning $ScriptName ("Canceled non-interactive update.");
-        :set ExitOK true;
-        :error false;
+        :exit;
       }
     }
   }
@@ -136,8 +129,7 @@
       }
     } else={
       $LogPrint warning $ScriptName ("Not installing downgrade automatically.");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
   }
 
@@ -145,8 +137,7 @@
     :local PkgName [ /system/package/get $Package name ];
     :if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={
       $LogPrint error $ScriptName ("Download for package " . $PkgName . " failed, update aborted.");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
   }
 
@@ -160,14 +151,12 @@
     :put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]";
     :if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={
       $Schedule $ScriptName;
-      :set ExitOK true;
-      :error true;
+      :exit;
     }
   } else={
     :if ($PackagesUpdateDeferReboot = true || [ :totime $PackagesUpdateDeferReboot ] >= 1d) do={
       $Schedule $ScriptName;
-      :set ExitOK true;
-      :error true;
+      :exit;
     }
   }
 
@@ -175,5 +164,5 @@
   :delay 1s;
   /system/reboot;
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 19a8ae84ed72c479ec5a31b3ddb73f16c3d42bd7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:24:01 +0100
Subject: [PATCH 30/36] ppp-on-up: early exit with :exit

---
 ppp-on-up.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index 79b83861..0a6af57a 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -8,7 +8,6 @@
 # run scripts on ppp up
 # https://rsc.eworm.de/doc/ppp-on-up.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -21,8 +20,7 @@
 
   :if ([ :typeof $Interface ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from ppp on-up script hook.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local IntName [ /interface/get $Interface name ];
@@ -40,5 +38,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 4066ce4b96246dd59d87668467967afbeff178fe Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:24:32 +0100
Subject: [PATCH 31/36] sms-action: early exit with :exit

---
 sms-action.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sms-action.rsc b/sms-action.rsc
index 12d4cc20..7a19edf7 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -8,7 +8,6 @@
 # run action on received SMS
 # https://rsc.eworm.de/doc/sms-action.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -24,8 +23,7 @@
 
   :if ([ :typeof $Action ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from SMS hook with action=...");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local Code ($SmsAction->$Action);
@@ -37,5 +35,5 @@
     $LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!");
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From ac8daa4da40020da14369a07f7f966103a82d49d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:25:19 +0100
Subject: [PATCH 32/36] sms-forward: early exit with :exit

---
 sms-forward.rsc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/sms-forward.rsc b/sms-forward.rsc
index 9f3d2558..68ba94aa 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -9,7 +9,6 @@
 # forward SMS to e-mail
 # https://rsc.eworm.de/doc/sms-forward.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -29,14 +28,12 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ /tool/sms/get receive-enabled ] = false) do={
     $LogPrintOnce warning $ScriptName ("Receiving of SMS is not enabled.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -45,8 +42,7 @@
 
   :if ([ /interface/lte/get ($Settings->"port") running ] != true) do={
     $LogPrint info $ScriptName ("The LTE interface is not in running state, skipping.");
-    :set ExitOK true;
-    :error true;
+    :exit;
   }
 
   # forward SMS in a loop
@@ -107,5 +103,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From bde3c3d0f68b14d905fdcb01e05da2be2ce628f4 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 15 Jan 2026 09:34:40 +0100
Subject: [PATCH 33/36] telegram-chat: early exit with :exit

---
 telegram-chat.rsc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index c0fa5c16..8ca27236 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -9,7 +9,6 @@
 # use Telegram to chat with your Router and send commands
 # https://rsc.eworm.de/doc/telegram-chat.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -48,8 +47,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $WaitFullyConnected;
@@ -63,8 +61,7 @@
 
   :if ([ $CertificateAvailable "Go Daddy Root Certificate Authority - G2" "fetch" ] = false) do={
     $LogPrint warning $ScriptName ("Downloading required certificate failed.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   $RandomDelay $TelegramRandomDelay;
@@ -89,8 +86,7 @@
 
   :if ($Data = false) do={
     $LogPrint warning $ScriptName ("Failed getting updates.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :local JSON [ :deserialize from=json value=$Data ];
@@ -146,8 +142,7 @@
             :local File ("tmpfs/telegram-chat/" . [ $GetRandom20CharAlNum 6 ]);
             :if ([ $MkDir "tmpfs/telegram-chat" ] = false) do={
               $LogPrint error $ScriptName ("Failed creating directory!");
-              :set ExitOK true;
-              :error false;
+              :exit;
             }
             $LogPrint info $ScriptName ("Running command from update " . $UpdateID . ": " . $Command);
             :execute script=(":do {\n" . $Command . "\n} on-error={ /file/add name=\"" . $File . ".failed\" };" . \
@@ -197,5 +192,5 @@
   :set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \
     [ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]);
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 1ce8a54440eb34f8045ee33133f5f32b06f1e75a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:25:51 +0100
Subject: [PATCH 34/36] update-gre-address: early exit with :exit

---
 update-gre-address.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/update-gre-address.rsc b/update-gre-address.rsc
index b8f0134f..50cc0a12 100644
--- a/update-gre-address.rsc
+++ b/update-gre-address.rsc
@@ -9,7 +9,6 @@
 # ipsec remote peer
 # https://rsc.eworm.de/doc/update-gre-address.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -21,8 +20,7 @@
   :global ScriptLock; 
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   /interface/gre/set remote-address=0.0.0.0 disabled=yes [ find where !running !disabled ];
@@ -42,5 +40,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From eb182fe769d872f4ae62bcbade9a9566ad4042ab Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:26:36 +0100
Subject: [PATCH 35/36] update-tunnelbroker: early exit with :exit

---
 update-tunnelbroker.rsc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 215dafa0..c0ce03bc 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -11,7 +11,6 @@
 # update local address of tunnelbroker interface
 # https://rsc.eworm.de/doc/update-tunnelbroker.md
 
-:local ExitOK false;
 :onerror Err {
   :global GlobalConfigReady; :global GlobalFunctionsReady;
   :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@@ -24,14 +23,12 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :if ([ $CertificateAvailable "Starfield Root Certificate Authority - G2" "fetch" ] = false) do={
     $LogPrint error $ScriptName ("Downloading required certificate failed.");
-    :set ExitOK true;
-    :error false;
+    :exit;
   }
 
   :foreach Interface in=[ /interface/6to4/find where comment~"^tunnelbroker" !disabled ] do={
@@ -54,8 +51,7 @@
 
     :if (!($Data ~ "^(good|nochg) ")) do={
       $LogPrint error $ScriptName ("Failed sending the local address to tunnelbroker or unexpected response!");
-      :set ExitOK true;
-      :error false;
+      :exit;
     }
 
     :local PublicAddress [ :pick $Data ([ :find $Data " " ] + 1) [ :find $Data "\n" ] ];
@@ -70,5 +66,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
+  :global ExitError; $ExitError false [ :jobname ] $Err;
 }

From 2e422a153fad152bfc0a08291728f10c3acb2219 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 19 Jan 2026 15:29:59 +0100
Subject: [PATCH 36/36] global-functions: $ExitError: drop argument $ExitOK...

... as the is no longer required with early exit with :exit.
---
 accesslist-duplicates.capsman.rsc      |  2 +-
 accesslist-duplicates.local.rsc        |  2 +-
 accesslist-duplicates.template.rsc     |  2 +-
 accesslist-duplicates.wifi.rsc         |  2 +-
 backup-cloud.rsc                       |  2 +-
 backup-email.rsc                       |  2 +-
 backup-partition.rsc                   |  2 +-
 backup-upload.rsc                      |  2 +-
 capsman-download-packages.capsman.rsc  |  2 +-
 capsman-download-packages.template.rsc |  2 +-
 capsman-download-packages.wifi.rsc     |  2 +-
 capsman-rolling-upgrade.capsman.rsc    |  2 +-
 capsman-rolling-upgrade.template.rsc   |  2 +-
 capsman-rolling-upgrade.wifi.rsc       |  2 +-
 certificate-renew-issued.rsc           |  2 +-
 check-certificates.rsc                 |  2 +-
 check-health.rsc                       |  2 +-
 check-lte-firmware-upgrade.rsc         |  2 +-
 check-perpetual-license.rsc            |  2 +-
 check-routeros-update.rsc              |  2 +-
 collect-wireless-mac.capsman.rsc       |  2 +-
 collect-wireless-mac.local.rsc         |  2 +-
 collect-wireless-mac.template.rsc      |  2 +-
 collect-wireless-mac.wifi.rsc          |  2 +-
 daily-psk.capsman.rsc                  |  2 +-
 daily-psk.local.rsc                    |  2 +-
 daily-psk.template.rsc                 |  2 +-
 daily-psk.wifi.rsc                     |  2 +-
 dhcp-lease-comment.capsman.rsc         |  2 +-
 dhcp-lease-comment.local.rsc           |  2 +-
 dhcp-lease-comment.template.rsc        |  2 +-
 dhcp-lease-comment.wifi.rsc            |  2 +-
 dhcp-to-dns.rsc                        |  2 +-
 firmware-upgrade-reboot.rsc            |  2 +-
 fw-addr-lists.rsc                      |  2 +-
 global-functions.rsc                   | 17 +++++++----------
 gps-track.rsc                          |  2 +-
 hotspot-to-wpa-cleanup.capsman.rsc     |  2 +-
 hotspot-to-wpa-cleanup.template.rsc    |  2 +-
 hotspot-to-wpa-cleanup.wifi.rsc        |  2 +-
 hotspot-to-wpa.capsman.rsc             |  2 +-
 hotspot-to-wpa.template.rsc            |  2 +-
 hotspot-to-wpa.wifi.rsc                |  2 +-
 ipsec-to-dns.rsc                       |  2 +-
 ipv6-update.rsc                        |  2 +-
 lease-script.rsc                       |  2 +-
 log-forward.rsc                        |  2 +-
 mod/bridge-port-to.rsc                 |  2 +-
 mod/bridge-port-vlan.rsc               |  2 +-
 mod/inspectvar.rsc                     |  2 +-
 mod/ipcalc.rsc                         |  2 +-
 mod/notification-email.rsc             |  4 ++--
 mod/notification-gotify.rsc            |  4 ++--
 mod/notification-matrix.rsc            |  4 ++--
 mod/notification-ntfy.rsc              |  4 ++--
 mod/notification-telegram.rsc          |  6 +++---
 mod/scriptrunonce.rsc                  |  2 +-
 mod/ssh-keys-import.rsc                |  4 ++--
 mode-button.rsc                        |  4 ++--
 netwatch-dns.rsc                       |  2 +-
 netwatch-notify.rsc                    |  2 +-
 ospf-to-leds.rsc                       |  2 +-
 packages-update.rsc                    |  2 +-
 ppp-on-up.rsc                          |  2 +-
 sms-action.rsc                         |  2 +-
 sms-forward.rsc                        |  2 +-
 telegram-chat.rsc                      |  2 +-
 update-gre-address.rsc                 |  2 +-
 update-tunnelbroker.rsc                |  2 +-
 69 files changed, 83 insertions(+), 86 deletions(-)

diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index 5bfa4be5..700d99d7 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -32,5 +32,5 @@
     :set ($Seen->$Mac) 1;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index 90b3d126..0b9d242c 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -32,5 +32,5 @@
     :set ($Seen->$Mac) 1;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index 898ed256..bcf3026d 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -41,5 +41,5 @@
     :set ($Seen->$Mac) 1;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index 3bdcf7c3..e201e4f8 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -32,5 +32,5 @@
     :set ($Seen->$Mac) 1;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index babf2b9a..d8724a30 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -96,5 +96,5 @@
   }
   $RmDir "tmpfs/backup-cloud";
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/backup-email.rsc b/backup-email.rsc
index b6c26680..7bc0b89e 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -133,5 +133,5 @@
   }
   # do not remove the files here, as the mail is still queued!
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/backup-partition.rsc b/backup-partition.rsc
index 6f3a84ec..0d1dc1a5 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -115,5 +115,5 @@
     :exit;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/backup-upload.rsc b/backup-upload.rsc
index 189d9d88..aa9aa320 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -169,5 +169,5 @@
   }
   $RmDir $DirName;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index be09795d..d0205b80 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -85,5 +85,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 14a45962..99daae70 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -96,5 +96,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 6b1da82f..5efc3e9a 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -87,5 +87,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 08cadf60..a1096016 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -44,5 +44,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index d10448ed..1b0e2d29 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -52,5 +52,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index 92541471..d2b62a8f 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -45,5 +45,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
index 9c22468d..3ad1bd0e 100644
--- a/certificate-renew-issued.rsc
+++ b/certificate-renew-issued.rsc
@@ -46,5 +46,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/check-certificates.rsc b/check-certificates.rsc
index ef5679ce..ab4cd904 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -248,5 +248,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/check-health.rsc b/check-health.rsc
index 793afd3a..35f70b69 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -103,5 +103,5 @@
 
   :set CheckHealthPlugins;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
index 7acef442..9292fdfe 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -101,5 +101,5 @@
     $CheckInterface $ScriptName $Interface;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
index 849843fd..643c0a00 100644
--- a/check-perpetual-license.rsc
+++ b/check-perpetual-license.rsc
@@ -69,5 +69,5 @@
     :set SentCertificateNotification;
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 1fe22770..fb4b0901 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -203,5 +203,5 @@
     :set SentRouterosUpdateNotification ($Update->"latest-version");
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
index 0231edba..144f36cd 100644
--- a/collect-wireless-mac.capsman.rsc
+++ b/collect-wireless-mac.capsman.rsc
@@ -94,5 +94,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index a799b418..dca6a89c 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -95,5 +95,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index 2d6eed0c..fe02b6ba 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -112,5 +112,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
index 1636ddcc..fbd8b81a 100644
--- a/collect-wireless-mac.wifi.rsc
+++ b/collect-wireless-mac.wifi.rsc
@@ -94,5 +94,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 2892b886..a5e42d89 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -90,5 +90,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index cc7d45d9..62ca9309 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -89,5 +89,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 1b408aae..46dad2b3 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -105,5 +105,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 0bc54422..74d7aded 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -90,5 +90,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
index a069e9db..1bf8b9ec 100644
--- a/dhcp-lease-comment.capsman.rsc
+++ b/dhcp-lease-comment.capsman.rsc
@@ -37,5 +37,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
index cffe22b9..da2037b5 100644
--- a/dhcp-lease-comment.local.rsc
+++ b/dhcp-lease-comment.local.rsc
@@ -37,5 +37,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
index 1fe9a4a3..fbb60f1d 100644
--- a/dhcp-lease-comment.template.rsc
+++ b/dhcp-lease-comment.template.rsc
@@ -42,5 +42,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
index 41239861..358f2112 100644
--- a/dhcp-lease-comment.wifi.rsc
+++ b/dhcp-lease-comment.wifi.rsc
@@ -37,5 +37,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index 573336b0..d52000be 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -124,5 +124,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
index 10df1a47..cf08cfd2 100644
--- a/firmware-upgrade-reboot.rsc
+++ b/firmware-upgrade-reboot.rsc
@@ -52,5 +52,5 @@
   $LogPrint info $ScriptName ("Firmware upgrade successful, rebooting.");
   /system/reboot;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 5f2dd972..e4b9bb11 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -230,5 +230,5 @@
         " - removed: " . [ $HumanReadableNum $CntRemove 1000 ]);
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/global-functions.rsc b/global-functions.rsc
index 2aad406e..c23c5150 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -474,18 +474,15 @@
 
 # simple macro to print error message on unintentional error
 :set ExitError do={
-  :local ExitOK [ :tostr $1 ];
-  :local Name   [ :tostr $2 ];
-  :local Error  [ :tostr $3 ];
+  :local Name   [ :tostr $1 ];
+  :local Error  [ :tostr $2 ];
 
   :global IfThenElse;
   :global LogPrint;
 
-  :if ($ExitOK = "false") do={
-    $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \
-        "Function" "Script" ] . " '" . $Name . "' exited with error" . \
-        [ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]);
-  }
+  $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \
+      "Function" "Script" ] . " '" . $Name . "' exited with error" . \
+      [ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]);
 }
 
 # fetch huge data to file, read in chunks
@@ -1503,7 +1500,7 @@
     :set GlobalConfigMigration;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # lock script against multiple invocation
@@ -1649,7 +1646,7 @@
 
   $SendNotification2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via NotificationFunctions - expects one array argument
diff --git a/gps-track.rsc b/gps-track.rsc
index ed089405..05a5e57a 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -47,5 +47,5 @@
     $LogPrint debug $ScriptName ("GPS data not valid.");
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index 2a988944..c816ac67 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -74,5 +74,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 290aee52..d4a82a94 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -81,5 +81,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 6ed60e87..1fb3527f 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -74,5 +74,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc
index b976c356..103d24e6 100644
--- a/hotspot-to-wpa.capsman.rsc
+++ b/hotspot-to-wpa.capsman.rsc
@@ -97,5 +97,5 @@
   :delay 2s;
   /caps-man/access-list/set $Entry action=accept;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc
index 6f75a7e6..6746b56f 100644
--- a/hotspot-to-wpa.template.rsc
+++ b/hotspot-to-wpa.template.rsc
@@ -117,5 +117,5 @@
   /caps-man/access-list/set $Entry action=accept;
   /interface/wifi/access-list/set $Entry action=accept;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index b36cefba..71c3e57e 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -94,5 +94,5 @@
   :delay 2s;
   /interface/wifi/access-list/set $Entry action=accept;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index 6296da3f..7f42ee98 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -78,5 +78,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index 7b7cc563..e15935c4 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -98,5 +98,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/lease-script.rsc b/lease-script.rsc
index af0add7a..431c36d1 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -57,5 +57,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/log-forward.rsc b/log-forward.rsc
index 6ad1d586..97a0bff3 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -108,5 +108,5 @@
 
   :set LogForwardLast $Max;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/mod/bridge-port-to.rsc b/mod/bridge-port-to.rsc
index 0c9ceab9..5f8d6b93 100644
--- a/mod/bridge-port-to.rsc
+++ b/mod/bridge-port-to.rsc
@@ -66,5 +66,5 @@
     /interface/ethernet/enable $InterfaceReEnable;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
diff --git a/mod/bridge-port-vlan.rsc b/mod/bridge-port-vlan.rsc
index a4b553f3..51500f3a 100644
--- a/mod/bridge-port-vlan.rsc
+++ b/mod/bridge-port-vlan.rsc
@@ -75,5 +75,5 @@
     /interface/ethernet/enable $InterfaceReEnable;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index d37fb2f4..977e1f99 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -17,7 +17,7 @@
 
   :put [ :tocrlf [ $InspectVarReturn $1 ] ];
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # inspect variable and return formatted string
diff --git a/mod/ipcalc.rsc b/mod/ipcalc.rsc
index 41264ee5..20760038 100644
--- a/mod/ipcalc.rsc
+++ b/mod/ipcalc.rsc
@@ -28,7 +28,7 @@
     [ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \
     [ $FormatLine "Broadcast" ($Values->"broadcast") ]) ];
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # calculate and return netmask, network, min host, max host and broadcast
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 3f6bd6fc..daf4cdc2 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -131,7 +131,7 @@
   /system/scheduler/set interval=(($SchedVal->"run-count") . "m") \
       comment="Waiting for retry..." $Scheduler;
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # generate filter for log-forward
@@ -259,7 +259,7 @@
 
   $SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 });
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via e-mail - expects one array argument
diff --git a/mod/notification-gotify.rsc b/mod/notification-gotify.rsc
index 13b53a26..31786f1d 100644
--- a/mod/notification-gotify.rsc
+++ b/mod/notification-gotify.rsc
@@ -54,7 +54,7 @@
     :set GotifyQueue;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via Gotify - expects one array argument
@@ -126,7 +126,7 @@
 
   $SendGotify2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via Gotify - expects one array argument
diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index 7965b843..f2d7a943 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -59,7 +59,7 @@
     :set MatrixQueue;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via Matrix - expects one array argument
@@ -172,7 +172,7 @@
 
   $SendMatrix2 ({ origin=$0; subject=$1; message=$2; link=$3 });
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via Matrix - expects one array argument
diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index 98be14bb..d74a3a49 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -53,7 +53,7 @@
     :set NtfyQueue;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via ntfy - expects one array argument
@@ -148,7 +148,7 @@
 
   $SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via ntfy - expects one array argument
diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index fa781d94..b6aef486 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -62,7 +62,7 @@
     :set TelegramQueue;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # get the chat id
@@ -101,7 +101,7 @@
     $LogPrint info $0 ("The thread id is: " . ($Message->"message_thread_id"));
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } } 
 
 # send notification via telegram - expects one array argument
@@ -237,7 +237,7 @@
 
   $SendTelegram2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # send notification via telegram - expects one array argument
diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index 6ffb44a4..5f76eb02 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -52,5 +52,5 @@
     :return true;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index f858a545..36ca9f8a 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -67,7 +67,7 @@
     :return false;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # import keys from a file
@@ -109,5 +109,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
diff --git a/mode-button.rsc b/mode-button.rsc
index fa11f19f..f9fb6398 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -82,7 +82,7 @@
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
       }
     } do={
-      :global ExitError; $ExitError false $0 $Err;
+      :global ExitError; $ExitError $0 $Err;
     } }
     /system/scheduler/add name="_ModeButtonScheduler" \
         on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s;
@@ -91,5 +91,5 @@
     /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ];
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 50c9d57e..98e27dab 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -139,5 +139,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index 4ed7e916..0d5402bd 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -223,5 +223,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index 8b3cb920..14633482 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -43,5 +43,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/packages-update.rsc b/packages-update.rsc
index 75a9bfe8..cbce4323 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -164,5 +164,5 @@
   :delay 1s;
   /system/reboot;
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index 0a6af57a..3112e5b8 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -38,5 +38,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/sms-action.rsc b/sms-action.rsc
index 7a19edf7..f0cbede2 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -35,5 +35,5 @@
     $LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!");
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/sms-forward.rsc b/sms-forward.rsc
index 68ba94aa..715f9e99 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -103,5 +103,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index 8ca27236..698fac52 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -192,5 +192,5 @@
   :set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \
     [ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]);
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/update-gre-address.rsc b/update-gre-address.rsc
index 50cc0a12..66db847d 100644
--- a/update-gre-address.rsc
+++ b/update-gre-address.rsc
@@ -40,5 +40,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index c0ce03bc..4fa53abd 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -66,5 +66,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }