diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/generic/depends/DependentServiceResolver.java b/Ghidra/Debug/ProposedUtils/src/main/java/generic/depends/DependentServiceResolver.java
index 87b71b2366..71431d8d3f 100644
--- a/Ghidra/Debug/ProposedUtils/src/main/java/generic/depends/DependentServiceResolver.java
+++ b/Ghidra/Debug/ProposedUtils/src/main/java/generic/depends/DependentServiceResolver.java
@@ -144,12 +144,15 @@ public class DependentServiceResolver<T> {
 				constructed.put(cons.method, service);
 			}
 			instancesByClass.put(cons.cls, service);
-			for (Field f : fieldsByClass.remove(cons.cls)) {
-				try {
-					f.set(obj, service);
-				}
-				catch (IllegalArgumentException | IllegalAccessException e) {
-					throw new AssertionError(e);
+			Set<Field> fields = fieldsByClass.remove(cons.cls);
+			if (fields != null) {
+				for (Field f : fields) {
+					try {
+						f.set(obj, service);
+					}
+					catch (IllegalArgumentException | IllegalAccessException e) {
+						throw new AssertionError(e);
+					}
 				}
 			}
 		}