diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java
index 8aa432e2f5..2986c5f644 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupV1MessageProcessor.java
@@ -51,6 +51,7 @@ public final class GroupV1MessageProcessor {
                                        @NonNull SignalServiceContent content,
                                        @NonNull SignalServiceDataMessage message,
                                        boolean outgoing)
+      throws BadGroupIdException
   {
     SignalServiceGroupContext    signalServiceGroupContext = message.getGroupContext().get();
     Optional<SignalServiceGroup> groupV1                   = signalServiceGroupContext.getGroupV1();
@@ -66,7 +67,7 @@ public final class GroupV1MessageProcessor {
 
     GroupDatabase         database = DatabaseFactory.getGroupDatabase(context);
     SignalServiceGroup    group    = groupV1.get();
-    GroupId               id       = GroupId.v1orThrow(group.getGroupId());
+    GroupId               id       = GroupId.v1(group.getGroupId());
     Optional<GroupRecord> record   = database.getGroup(id);
 
     if (record.isPresent() && group.getType() == Type.UPDATE) {