From 988fe4f54e6fabd56be8ec7415a7ec83bceb63b0 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Tue, 19 May 2026 17:25:53 -0400
Subject: [PATCH] GP-6854 Corrected NPE in PropertyListMergeManager

---
 .../ghidra/app/merge/propertylist/PropertyListMergeManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java
index 96272f4482..bf53d1e390 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java
@@ -322,7 +322,7 @@ public class PropertyListMergeManager implements MergeResolver {
 		Object myValue = getValue(myList, propertyName);
 		Object origValue = getValue(origList, propertyName);
 
-		if (!myValue.equals(origValue)) {
+		if (!Objects.equals(myValue, origValue)) {
 			setValue(resultList, propertyName, myList.getType(propertyName), myValue);
 		}