diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java index 868ab78a..986a8853 100644 --- a/src/main/java/org/asamk/signal/Manager.java +++ b/src/main/java/org/asamk/signal/Manager.java @@ -802,12 +802,22 @@ class Manager implements Signal { @Override public String getGroupName(byte[] groupId) { - return getGroup(groupId).name; + GroupInfo group = getGroup(groupId); + if (group == null) { + return ""; + } else { + return group.name; + } } @Override public List getGroupMembers(byte[] groupId) { - return new ArrayList(getGroup(groupId).members); + GroupInfo group = getGroup(groupId); + if (group == null) { + return new ArrayList(); + } else { + return new ArrayList(group.members); + } } @Override