diff --git a/src/org/thoughtcrime/securesms/service/PushReceiver.java b/src/org/thoughtcrime/securesms/service/PushReceiver.java
index 58296e2ef1..a6d0a5bbc4 100644
--- a/src/org/thoughtcrime/securesms/service/PushReceiver.java
+++ b/src/org/thoughtcrime/securesms/service/PushReceiver.java
@@ -148,7 +148,6 @@ public class PushReceiver {
                                      boolean secure)
   {
     try {
-      Log.w("PushReceiver", "Processing: " + new String(message.getBody()));
       PushMessageContent messageContent = PushMessageContent.parseFrom(message.getBody());
 
       if (messageContent.hasGroup()) {
@@ -261,7 +260,9 @@ public class PushReceiver {
                                          boolean secure)
   {
     EncryptingSmsDatabase database    = DatabaseFactory.getEncryptingSmsDatabase(context);
-    IncomingTextMessage   textMessage = new IncomingTextMessage(message, "", messageContent.getGroup());
+    IncomingTextMessage   textMessage = new IncomingTextMessage(message, "",
+                                                                messageContent.hasGroup() ?
+                                                                    messageContent.getGroup() : null);
 
     if (secure) {
       textMessage = new IncomingEncryptedMessage(textMessage, "");