diff --git a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java b/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
index 9e05f5d89..eec11f260 100644
--- a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
+++ b/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
@@ -28,13 +28,11 @@ public class DeleteCacheService extends JobIntentService {
         Log.w(TAG, "Deleting all cached contents!");
         try {
             File cacheDir = getCacheDir();
-            if (cacheDir != null) {
-                FileUtils.deleteDirectory(cacheDir);
-            }
+            FileUtils.deleteDirectory(cacheDir);
             for (File dir : ContextCompat.getExternalCacheDirs(this)) {
                 FileUtils.deleteDirectory(dir);
             }
-        } catch (Exception e) {
+        } catch (Throwable e) { // NOPMD
             // ignored
         }
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
index 980dc8dc8..dfbfcac9a 100644
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@@ -236,7 +236,7 @@ public class UpdateService extends JobIntentService {
                     Utils.debugLog(TAG, "scheduling update because there is good internet");
                     schedule(context);
                 }
-            } catch (Exception e) {
+            } catch (Throwable e) { // NOPMD
                 Utils.debugLog(TAG, e.getMessage());
             }
             isScheduleIfStillOnWifiRunning = false;
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 34bbc664c..479d53e49 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -384,7 +384,7 @@ public final class Utils {
             }
             ret = formatter.toString();
             formatter.close();
-        } catch (Exception e) {
+        } catch (Throwable e) { // NOPMD
             Log.w(TAG, "Unable to get certificate fingerprint", e);
         }
         return ret;