diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index 688f704..ee82638 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 12506ea..91a9167 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -12,11 +12,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 78238ef..cb6cb6f 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;