diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index d24b6f7f02..0517a5817c 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2237,9 +2237,9 @@ public class Helper {
             exists.put(dir, true);
         }
 
-        if (!dir.exists())
+        if (!isUiThread() && !dir.exists())
             if (!dir.mkdirs())
-                Log.e("Cannot create directory=" + dir);
+                throw new IllegalArgumentException("Failed to create=" + dir);
 
         return dir;
     }