diff --git a/check-health.rsc b/check-health.rsc
index f02a249..75710a0 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CheckHealthCPUUtilization;
@@ -105,6 +105,6 @@
   }
 
   :set CheckHealthPlugins;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }