diff --git a/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java b/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java
index 308d70c2a..66e3853bf 100644
--- a/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java
+++ b/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java
@@ -14,6 +14,9 @@ import java.io.File;
 @TargetApi(21)
 class CleanCacheService21 {
     static void deleteIfOld(File file, long olderThan) {
+        if (file == null || !file.exists()) {
+            return;
+        }
         try {
             StructStat stat = Os.lstat(file.getAbsolutePath());
             if ((stat.st_atime * 1000L) < olderThan) {