From b6684906fc5b6a089f2bbb973d53fb8898c6cdb1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 6 Dec 2015 15:45:31 +0100
Subject: [PATCH] Fix groups for upgraded clients

---
 src/main/java/cli/Manager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index a0fb5b01..cc81c14d 100644
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -128,6 +128,9 @@ class Manager {
         if (groupStoreNode != null) {
             groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class);
         }
+        if (groupStore == null) {
+            groupStore = new JsonGroupStore();
+        }
         accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password, USER_AGENT);
     }