From 32b8cd87f377284a1fd57c51107eabc91a09be1d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 14 Sep 2020 17:00:58 +0200
Subject: [PATCH] Added failsafe

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b96331db1b..d9a2e4c4ee 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1571,7 +1571,8 @@ public class FragmentCompose extends FragmentBase {
         new SimpleTask<List<EntityAnswer>>() {
             @Override
             protected List<EntityAnswer> onExecute(Context context, Bundle args) {
-                return DB.getInstance(context).answer().getAnswers(false);
+                List<EntityAnswer> answers = DB.getInstance(context).answer().getAnswers(false);
+                return (answers == null ? new ArrayList<>() : answers);
             }
 
             @Override