diff --git a/app/build.gradle b/app/build.gradle
index 3bda0ae38..6414d0122 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 71
-        versionName "2.0.1"
+        versionCode 72
+        versionName "2.0.2"
 
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 2c453ed1d..a3200c4ec 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -637,7 +637,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             colors.recycle();
         }
 
-        thumbnail.setOnClickListener(new ColorSelectListener(tempLoyaltyCard.headerColor));
+        // It can't be null because we set it in updateTempState but SpotBugs insists it can be
+        // NP_NULL_ON_SOME_PATH: Possible null pointer dereference
+        if(tempLoyaltyCard.headerColor != null) {
+            thumbnail.setOnClickListener(new ColorSelectListener(tempLoyaltyCard.headerColor));
+        }
 
         // Update from intent
         if (barcodeType != null) {