diff --git a/src/main/java/com/b44t/messenger/DcAccounts.java b/src/main/java/com/b44t/messenger/DcAccounts.java
index bda939d65..669048b12 100644
--- a/src/main/java/com/b44t/messenger/DcAccounts.java
+++ b/src/main/java/com/b44t/messenger/DcAccounts.java
@@ -4,6 +4,7 @@ public class DcAccounts {
 
     public DcAccounts(String dir) {
         accountsCPtr = createAccountsCPtr(dir);
+        if (accountsCPtr == 0) throw new RuntimeException("createAccountsCPtr() returned null pointer");
     }
 
     @Override
diff --git a/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
index bf98af3d4..e56c5f0c4 100644
--- a/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 
 public class AvatarHelper {
     /* the maximum width/height an avatar should have */
-    public static final  int AVATAR_SIZE  = 640;
+    public static final  int AVATAR_SIZE  = 512;
 
     public static void setGroupAvatar(Context context, int chatId, Bitmap bitmap) {
         DcContext dcContext = DcHelper.getContext(context);