diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 57195cf8..1f5786ff 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -807,12 +807,10 @@ export class GBMinService {
       // Builds bot numbers map in WhatsAppDirectLine globals.
 
       let botNumber = min.core.getParam<string>(min.instance, 'Bot Number', null);
-      if (!botNumber){
-        botNumber = minBoot.core.getParam(minBoot.instance, 'Bot Number', null);
+      if (botNumber){
+        WhatsappDirectLine.botsByNumber[botNumber] = min.whatsAppDirectLine;
       }
 
-      WhatsappDirectLine.botsByNumber[botNumber] = min.whatsAppDirectLine;
-
       // Setups default BOT Framework dialogs.
     
     min.userProfile = conversationState.createProperty('userProfile');
diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index ef55a433..632a9d02 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -317,9 +317,7 @@ export class WhatsappDirectLine extends GBService {
 
         // Every number must be mapped to a bot, even if shared by boot bot.
         
-        if (newThis === undefined) {
-          throw GBError.create(`Bot Number ${to} not setup for any loaded bot.`);
-        } else {
+        if (newThis) {
 
           // Reroute to custom bot only if it is not boot bot.