diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 55c8e654e1..a6770b4872 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1169,6 +1169,8 @@ class Core {
 
         DB db = DB.getInstance(context);
         EntityAccount account = db.account().getAccount(folder.account);
+        if (account == null)
+            throw new IllegalArgumentException("account missing");
 
         try {
             if (removed) {