diff --git a/mode-button.rsc b/mode-button.rsc
index edc5f400..2b773bc2 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global ModeButton;
@@ -83,7 +83,7 @@
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
       }
     } on-error={
-      :global ExitError; $ExitError false $0;
+      :global ExitError; $ExitError false $0 $Err;
     } }
     /system/scheduler/add name="_ModeButtonScheduler" \
         on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s;
@@ -91,6 +91,6 @@
     $LogPrint debug $ScriptName ("Updating scheduler _ModeButtonScheduler...");
     /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ];
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }