diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
index 343d9e5a0..ea6e8c67f 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
@@ -150,7 +150,7 @@ public class AppCardController extends RecyclerView.ViewHolder implements ImageL
 
     @Override
     public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-        if (featuredImage != null) {
+        if (featuredImage != null && loadedImage != null) {
             new Palette.Builder(loadedImage).generate(new Palette.PaletteAsyncListener() {
                 @Override
                 public void onGenerated(Palette palette) {
diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index bd0ee94b2..c190ac645 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -227,7 +227,9 @@ public class PreferencesFragment extends PreferenceFragment
         // way to easily install from here.
         if (Build.VERSION.SDK_INT > 19 && !installed) {
             PreferenceCategory other = (PreferenceCategory) findPreference("pref_category_other");
-            other.removePreference(pref);
+            if (pref != null) {
+                other.removePreference(pref);
+            }
         } else {
             pref.setEnabled(installed);
             pref.setDefaultValue(installed);