diff --git a/libsignal.py b/libsignal.py
index 79782c9..a473298 100644
--- a/libsignal.py
+++ b/libsignal.py
@@ -49,14 +49,15 @@ def main():
         if envelope:
             dataMessage = envelope.get("dataMessage", None)
             if dataMessage:
-                name = envelope["sourceName"]
-                body = dataMessage["message"]
-                groupId = dataMessage["groupInfo"]["groupId"]
-                if body is not None:
-                    for group, func in libcommon.signalMessageBinds:
-                        if group is None or group.id == groupId:
-                            func(name, body)
-                            break
+                groupId = dataMessage.get("groupInfo", None)
+                if groupId:
+                    name = envelope["sourceName"]
+                    body = dataMessage["message"]
+                    if body is not None:
+                        for group, func in libcommon.signalMessageBinds:
+                            if group is None or group.id == groupId:
+                                func(name, body)
+                                break
 
 
 if __name__ == "__main__":