diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSource.kt
index 3b02eb67b8..76380ab40f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSource.kt
@@ -241,7 +241,9 @@ class ContactSearchPagedDataSource(
     }
   }
 
-  private fun canSendToGroup(groupRecord: GroupRecord): Boolean {
+  private fun canSendToGroup(groupRecord: GroupRecord?): Boolean {
+    if (groupRecord == null) return false
+
     return if (groupRecord.isAnnouncementGroup) {
       groupRecord.isAdmin(Recipient.self())
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.java
index 50b3dc0e60..2c729005de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.java
@@ -50,6 +50,7 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
 import java.io.Closeable;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;