diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
index 16c869b1e..40fba8548 100644
--- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
@@ -531,7 +531,10 @@ class NotificationHelper {
                     // Need to check that the notification is still valid, and also that the image
                     // is indeed cached now, so we won't get stuck in an endless loop.
                     AppUpdateStatusManager.AppUpdateStatus oldEntry = appUpdateStatusManager.get(entry.getUniqueKey());
-                    if (oldEntry != null && oldEntry.app != null && oldEntry.app.iconUrl != null && DiskCacheUtils.findInCache(oldEntry.app.iconUrl, ImageLoader.getInstance().getDiskCache()) != null) {
+                    if (oldEntry != null
+                            && oldEntry.app != null
+                            && oldEntry.app.iconUrl != null
+                            && DiskCacheUtils.findInCache(oldEntry.app.iconUrl, ImageLoader.getInstance().getDiskCache()) != null) {
                         createNotification(oldEntry); // Update with new image!
                     }
                 }
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
index e8479c22f..da2a6a4e5 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
@@ -72,7 +72,7 @@ class ApkSignatureVerifier {
 
         PackageInfo pkgInfo = pm.getPackageArchiveInfo(pkgPath, PackageManager.GET_SIGNATURES);
         if (pkgInfo == null) {
-            throw new NullPointerException("Could not find PackageInfo for package at \"" + pkgPath + "\".");
+            throw new IllegalArgumentException("Could not find PackageInfo for package at \"" + pkgPath + "\".");
         }
 
         return signatureToBytes(pkgInfo.signatures);