diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index b69f86c8..3d677905 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -266,6 +266,11 @@ export class AzureDeployerService implements IGBInstallationDeployer {
   }
 
   public async updateBotProxy(botId: string, group: string, endpoint: string) {
+    if (!await this.botExists(botId)) {
+      GBLog.error(`Bot ${botId} does not exist on cloud.`);  
+
+      return;
+    }
     const baseUrl = `https://management.azure.com/`;
     const username = GBConfigService.get('CLOUD_USERNAME');
     const password = GBConfigService.get('CLOUD_PASSWORD');
diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts
index dd1c1231..b47b2875 100644
--- a/packages/core.gbapp/services/GBCoreService.ts
+++ b/packages/core.gbapp/services/GBCoreService.ts
@@ -433,6 +433,7 @@ ENDPOINT_UPDATE=true
         await CollectionUtil.asyncForEach(instances, async instance => {
           GBLog.info(`Updating bot endpoint for ${instance.botId}...`);
           try {
+            
             await installationDeployer.updateBotProxy(
               instance.botId,
               GBConfigService.get('CLOUD_GROUP'),