diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index 79d2732b..a43121d1 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -1252,14 +1252,17 @@ export class GBConversationalService {
       }
       analytics.createMessage(min.instance.instanceId, conversation, null, text);
     }
-    console.log(GBUtil.toYAML(step));
-    if (step && step.IsRevoked) {
 
-      await min.whatsAppDirectLine.sendToDevice(user.userSystemId, 
-          text);
-
-    } else {
+    
+    try{
+      // TODO: Remove MS BOT Framework and put GBNative.
+      
       await step.context.sendActivity(text);
+
+    } catch {
+      await min.whatsAppDirectLine.sendToDevice(user.userSystemId, 
+        text);
+
     }
   }
   public async broadcast(min: GBMinInstance, message: string) {