diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index 77b67241c7..b7e4620e08 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -459,7 +459,10 @@ public class ContactInfo {
                             }
 
                         if (info.bitmap == null)
-                            throw ex;
+                            if (ex == null)
+                                throw new FileNotFoundException();
+                            else
+                                throw ex;
 
                         // Add to cache
                         File output = new File(dir,