diff --git a/setup.py b/setup.py
index 0fb7090..2e25bc2 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ except ImportError:
 
 setup(name="slack-backup",
       packages=["slack_backup"],
-      version="0.4.4",
+      version="0.4.5",
       description="Make copy of slack converstaions",
       author="Roman Dobosz",
       author_email="gryf73@gmail.com",
diff --git a/slack_backup/client.py b/slack_backup/client.py
index 9e2a2c6..52da951 100644
--- a/slack_backup/client.py
+++ b/slack_backup/client.py
@@ -147,8 +147,12 @@ class Client(object):
         Create message with corresponding possible metadata, like reactions,
         files etc.
         """
-        user = self.q(o.User).\
-            filter(o.User.slackid == data['user']).one()
+        try:
+            user = self.q(o.User).\
+                filter(o.User.slackid == data['user']).one()
+        except KeyError:
+            user = self.q(o.User).\
+                    filter(o.User.slackid == data['comment']['user']).one()
 
         if data['type'] == 'message' and not data['text'].strip():
             logging.info("Skipping message from `%s' since it's empty",