From badb57699142c79f7812e70b53aedc993cfaec3a Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 26 Feb 2022 14:04:35 +0000
Subject: [PATCH] Fixed exception when identifier is null. Also handling null
 names as this may be a future scenario.

---
 .../arbitrary/ArbitraryDataStorageManager.java           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
index fc97fdf8..63b70691 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
@@ -338,9 +338,12 @@ public class ArbitraryDataStorageManager extends Thread {
         // Loop through cached hostedTransactions
         for (ArbitraryTransactionData atd : this.hostedTransactions) {
             try {
-               
-                if(atd.getName().toLowerCase().contains(this.searchQuery) || atd.getIdentifier().toLowerCase().contains(this.searchQuery))
-                    searchResultsList.add(atd);
+               if (atd.getName() != null && atd.getName().toLowerCase().contains(this.searchQuery)) {
+                   searchResultsList.add(atd);
+               }
+               else if (atd.getIdentifier() != null && atd.getIdentifier().toLowerCase().contains(this.searchQuery)) {
+                   searchResultsList.add(atd);
+               }
 
             } catch (Exception e) {
                 continue;