diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
index 3fe0ebff47..86f87b9323 100644
--- a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
@@ -61,7 +61,7 @@ public class IncomingTextMessage implements Parcelable {
     this.pseudoSubject        = "";
     this.sentTimestampMillis  = message.getTimestampMillis();
 
-    if (group.hasId()) {
+    if (group != null && group.hasId()) {
       this.groupId = GroupUtil.getEncodedId(group.getId().toByteArray());
     } else {
       this.groupId = null;