diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
index 84217f71..bf889f38 100644
--- a/packages/admin.gbapp/dialogs/AdminDialog.ts
+++ b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -365,12 +365,15 @@ export class AdminDialog extends IGBDialog {
 
           min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);
 
+          const redirectUri = urlJoin(
+            min.instance.botEndpoint,
+            min.instance.botId,
+            '/token'
+          );
           const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant
-            }/oauth2/authorize?client_id=${min.instance.marketplaceId}&response_type=code&redirect_uri=${urlJoin(
-              min.instance.botEndpoint,
-              min.instance.botId,
-              '/token'
-            )}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
+            }/oauth2/authorize?client_id=${min.instance.marketplaceId
+            }&response_type=code&redirect_uri=${redirectUri
+            }&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
 
           await min.conversationalService.sendText(min, step, Messages[locale].consent(url));
 
diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts
index 76ae9f29..6996893b 100644
--- a/packages/basic.gblib/services/GBVMService.ts
+++ b/packages/basic.gblib/services/GBVMService.ts
@@ -261,7 +261,7 @@ export class GBVMService extends GBService {
     });
 
     code = code.replace(/(exit)/gi, () => {
-      return `resolve();\n`;
+      return `if(resolve) {resolve();}\n`;
     });
 
     code = code.replace(/(show menu)/gi, () => {