diff --git a/scripts/serverless.js b/scripts/serverless.js
index b52d41ad2..d875dea7f 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -358,8 +358,11 @@ const processSpanPromise = (async () => {
         serverless.invokedInstance.invocationId = serverless.invocationId;
         serverless = serverless.invokedInstance;
       }
-      if (configuration) {
-        if (configuration.plugins && providerName) {
+
+      // IIFE for maintanance convenience
+      await (async () => {
+        if (!configuration || !providerName) return;
+        if (configuration.plugins) {
           // TODO: Remove "serverless.pluginManager.externalPlugins" check with next major
           if (serverless.pluginManager.externalPlugins) {
             if (serverless.pluginManager.externalPlugins.size) {
@@ -383,22 +386,22 @@ const processSpanPromise = (async () => {
             variablesMeta = null;
           }
         }
+        if (isHelpRequest) return;
+        if (!_.get(variablesMeta, 'size')) return;
 
-        if (!isHelpRequest && _.get(variablesMeta, 'size')) {
-          if (commandSchema) {
-            resolverConfiguration.options = filterSupportedOptions(options, {
-              commandSchema,
-              providerName,
-            });
-          }
-          resolverConfiguration.sources.sls = require('../lib/configuration/variables/sources/instance-dependent/get-sls')(
-            serverless
-          );
-          resolverConfiguration.fulfilledSources.add('opt').add('sls');
-          await resolveVariables(resolverConfiguration);
-          eventuallyReportVariableResolutionErrors(configurationPath, configuration, variablesMeta);
+        if (commandSchema) {
+          resolverConfiguration.options = filterSupportedOptions(options, {
+            commandSchema,
+            providerName,
+          });
         }
-      }
+        resolverConfiguration.sources.sls = require('../lib/configuration/variables/sources/instance-dependent/get-sls')(
+          serverless
+        );
+        resolverConfiguration.fulfilledSources.add('opt').add('sls');
+        await resolveVariables(resolverConfiguration);
+        eventuallyReportVariableResolutionErrors(configurationPath, configuration, variablesMeta);
+      })();
 
       if (isHelpRequest && serverless.pluginManager.externalPlugins) {
         require('../lib/cli/render-help')(serverless.pluginManager.externalPlugins);