diff --git a/app/src/main/java/eu/faircode/email/ActivityWidget.java b/app/src/main/java/eu/faircode/email/ActivityWidget.java
index 02351c6fa5..c4b179c972 100644
--- a/app/src/main/java/eu/faircode/email/ActivityWidget.java
+++ b/app/src/main/java/eu/faircode/email/ActivityWidget.java
@@ -109,6 +109,9 @@ public class ActivityWidget extends ActivityBase {
 
             @Override
             protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
+                if (accounts == null)
+                    accounts = new ArrayList<>();
+
                 EntityAccount all = new EntityAccount();
                 all.id = -1L;
                 all.name = getString(R.string.title_widget_account_all);
diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
index 2ce73e4fac..1fdb890e79 100644
--- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
@@ -139,13 +139,16 @@ public class ActivityWidgetUnified extends ActivityBase {
 
                         DB db = DB.getInstance(context);
                         List<TupleFolderEx> folders = db.folder().getFoldersEx(account);
-                        if (folders.size() > 0)
+                        if (folders != null && folders.size() > 0)
                             Collections.sort(folders, folders.get(0).getComparator(context));
                         return folders;
                     }
 
                     @Override
                     protected void onExecuted(Bundle args, List<TupleFolderEx> folders) {
+                        if (folders == null)
+                            folders = new ArrayList<>();
+
                         TupleFolderEx unified = new TupleFolderEx();
                         unified.id = -1L;
                         unified.name = getString(R.string.title_widget_folder_unified);