From 1d4d9663dbad9cd2899461abbdd6c9b87d2be485 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 20 Feb 2014 11:17:30 -0800
Subject: [PATCH] Fix for NPE

---
 src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;