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);
     }