diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index d9017472..9ea5c305 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 614b4da6..0d62a19e 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 dad9fc63..49a0308e 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 c935420f..ca0630c9 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 397ba9e9..b6aeb6fc 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 440a36fd..f26313ec 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 a4952564..3aee1834 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 ea58bcb0..e8b37351 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 867ee63e..849f6a4b 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 5b086518..1d47d318 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 cf460ed1..9a0aaa57 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 dc5b09c5..948e9449 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 e0186644..3e769bba 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 b55a92fa..c49cf376 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 ef0410e9..a0a78d87 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 fd9d31a7..9c350947 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -247,5 +247,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false [ :jobname ] $Err;
+  :global ExitError; $ExitError [ :jobname ] $Err;
 }
diff --git a/check-health.rsc b/check-health.rsc
index 76a2d715..f0f2909f 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 b986084f..20268f5b 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 9d1b7562..1aa737d8 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 23427ee6..8be3e917 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 6bf1222d..65d56ef0 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 c7a92609..3897f344 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 9424bcac..a9cf82f1 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 0698587c..11f4eba2 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 fd0176ed..4043388e 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 6d7f26f4..d6d29055 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 4b04f84f..1b89d011 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 2e4f4d7f..c9bfc233 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 bde5e21b..2136f643 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 69b450b6..d0e077e9 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 3d03d04e..3a2d4dc7 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 d2c70dd7..c5d3cd4a 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 efb65c4c..dfb0399e 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 0e32cf02..0b56db77 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 492ad535..029ea7d8 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..f1c54d5e 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -474,9 +474,8 @@
 
 # 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;
@@ -1503,7 +1502,7 @@
     :set GlobalConfigMigration;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # lock script against multiple invocation
@@ -1649,7 +1648,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 c0cd0ba4..a0e88a29 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 49a61a28..60bd3715 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 8bf782e4..90c3f029 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 404f4a4c..7cf6a1b1 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 2a79147d..ff3a94b2 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 c7b94378..3e8c8c03 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 3a99bd1b..b3b1b79b 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 913a6e9d..dabed25c 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 35314121..dc7000ca 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 021f478e..ccd6a888 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 b14926bb..1046c80d 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 3d9567a9..845bf09c 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 d8c0bc79..ce7fc780 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 a485468e..bd1a330e 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 1ca76f62..d28387f7 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -146,7 +146,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
@@ -274,7 +274,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 677d993c..121c1a9b 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 b78b1132..80518a58 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 ac1792d4..e43de34a 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 9e9ae57e..79012bbc 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 598c7602..fb2bb429 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 16a02859..2732691c 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -68,7 +68,7 @@
     :return false;
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
 
 # import keys from a file
@@ -110,5 +110,5 @@
     }
   }
 } do={
-  :global ExitError; $ExitError false $0 $Err;
+  :global ExitError; $ExitError $0 $Err;
 } }
diff --git a/mode-button.rsc b/mode-button.rsc
index b5c89c7a..4ea82c3a 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 9a40ecc0..99dc8a2a 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 ad3a1aa7..e25b30d7 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 9d1265b5..c2a38992 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 6ac7ecf5..a0d40192 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 572686a3..6cc0755e 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 6a6470af..c2bc5829 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 934040f2..231e22a2 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 bac3a969..5f44ca3c 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 407a0b4b..58c6cc20 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 2fa07606..e669eb13 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;
 }