From 55e6a7be5ba4e4b3a804d137194529adc2f902da Mon Sep 17 00:00:00 2001
From: Finn <finn@finn.io>
Date: Mon, 20 Feb 2017 14:50:55 -0800
Subject: [PATCH] Handle null/non-existant groups better

---
 src/main/java/org/asamk/signal/Manager.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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<String> getGroupMembers(byte[] groupId) {
-        return new ArrayList<String>(getGroup(groupId).members);
+        GroupInfo group = getGroup(groupId);
+        if (group == null) {
+            return new ArrayList<String>();
+        } else {
+            return new ArrayList<String>(group.members);
+        }
     }
 
     @Override