diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java
index ff5707ce1c..5b72d04121 100644
--- a/app/src/main/java/eu/faircode/email/ImageHelper.java
+++ b/app/src/main/java/eu/faircode/email/ImageHelper.java
@@ -372,9 +372,11 @@ class ImageHelper {
                                     if (++redirects > MAX_REDIRECTS)
                                         throw new IOException("Too many redirects");
 
-                                    String location = URLDecoder.decode(
-                                            urlConnection.getHeaderField("Location"),
-                                            StandardCharsets.UTF_8.name());
+                                    String header = urlConnection.getHeaderField("Location");
+                                    if (header == null)
+                                        throw new IOException("Location header missing");
+
+                                    String location = URLDecoder.decode(header, StandardCharsets.UTF_8.name());
                                     url = new URL(url, location);
                                     Log.i("Redirect #" + redirects + " to " + url);