From 8e57a3958d5f32ee134f5e540be8b82b45f87251 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Wed, 18 Apr 2018 11:29:40 -0700
Subject: [PATCH] slack import: Improve error handling for invalid messages.

---
 zerver/lib/slack_data_to_zulip_data.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/zerver/lib/slack_data_to_zulip_data.py b/zerver/lib/slack_data_to_zulip_data.py
index 9bf381665f..11e4cfc3ca 100755
--- a/zerver/lib/slack_data_to_zulip_data.py
+++ b/zerver/lib/slack_data_to_zulip_data.py
@@ -668,10 +668,13 @@ def channel_message_to_zerver_message(realm_id: int, users: List[ZerverFieldsT],
             continue
 
         has_attachment = has_image = False
-        content, mentioned_users_id, has_link = convert_to_zulip_markdown(message['text'],
-                                                                          users,
-                                                                          added_channels,
-                                                                          added_users)
+        try:
+            content, mentioned_users_id, has_link = convert_to_zulip_markdown(
+                message['text'], users, added_channels, added_users)
+        except Exception:
+            print("Slack message unexpectedly missing text representation:")
+            print(json.dumps(message, indent=4))
+            continue
         rendered_content = None
 
         recipient_id = added_recipient[message['channel_name']]