diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index e938881d314f50b472cc84163508d10e4a08be62..c274924a4484ac2b8a66739168c17f68543a25c0 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -737,7 +737,9 @@ public class FileBackend {
             }
             return new ByteArrayInputStream(data);
         }
-        return mXmppConnectionService.getContentResolver().openInputStream(uri);
+        final InputStream is = mXmppConnectionService.getContentResolver().openInputStream(uri);
+        if (is == null) throw new FileNotFoundException("File not found");
+        return is;
     }
 
     private void copyFileToPrivateStorage(File file, Uri uri) throws FileCopyException {