diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 981f604..5aea5be 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -10,12 +10,12 @@
               <deviceKey>
                 <Key>
                   <type value="VIRTUAL_DEVICE_PATH" />
-                  <value value="$USER_HOME$/.android/avd/Pixel_2_API_34.avd" />
+                  <value value="$USER_HOME$/.android/avd/Pixel_4_XL_API_34.avd" />
                 </Key>
               </deviceKey>
             </Target>
           </targetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-04-21T10:28:14.063607866Z" />
+          <timeTargetWasSelectedWithDropDown value="2024-04-29T19:01:52.695697079Z" />
         </State>
       </entry>
     </value>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/cringe_studios/code_guard/icon/IconPack.java b/app/src/main/java/com/cringe_studios/code_guard/icon/IconPack.java
index 013561c..56439bf 100644
--- a/app/src/main/java/com/cringe_studios/code_guard/icon/IconPack.java
+++ b/app/src/main/java/com/cringe_studios/code_guard/icon/IconPack.java
@@ -19,6 +19,8 @@ public class IconPack {
     }
 
     public Icon findIconForIssuer(String issuer) {
+        if(issuer == null) return null;
+
         for(Icon icon : icons) {
             for(String i : icon.getMetadata().getIssuer()) {
                 if(issuer.equalsIgnoreCase(i)) {
diff --git a/app/src/main/java/com/cringe_studios/code_guard/otplist/OTPListAdapter.java b/app/src/main/java/com/cringe_studios/code_guard/otplist/OTPListAdapter.java
index ae25528..13570f0 100644
--- a/app/src/main/java/com/cringe_studios/code_guard/otplist/OTPListAdapter.java
+++ b/app/src/main/java/com/cringe_studios/code_guard/otplist/OTPListAdapter.java
@@ -245,8 +245,8 @@ public class OTPListAdapter extends RecyclerView.Adapter<OTPListItem> {
 
         List<OTPData> filtered = new ArrayList<>();
         for(OTPData d : allOTPs) {
-            if(d.getName().toLowerCase().contains(query)
-                || d.getIssuer().toLowerCase().contains(query)) filtered.add(d);
+            if((d.getName() != null && d.getName().toLowerCase().contains(query))
+                || (d.getIssuer() != null && d.getIssuer().toLowerCase().contains(query))) filtered.add(d);
         }
 
         filteredItems = filtered;
diff --git a/build.gradle b/build.gradle
index 89f38df..603b6eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.2' apply false
-    id 'com.android.library' version '8.3.2' apply false
+    id 'com.android.application' version '8.5.0' apply false
+    id 'com.android.library' version '8.5.0' apply false
     id 'com.google.protobuf' version '0.9.3' apply false
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e471291..c175cb4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Jun 17 16:15:03 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists