diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/ReferenceUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/ReferenceUtils.java index 51dbb0a1c5..164f63439c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/ReferenceUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/ReferenceUtils.java @@ -862,8 +862,10 @@ public final class ReferenceUtils { Program p = location.getProgram(); Listing l = p.getListing(); Data dataContaining = l.getDataContaining(location.getAddress()); - Data data = dataContaining.getComponent(location.getComponentPath()); - return data; + if (dataContaining != null) { + return dataContaining.getComponent(location.getComponentPath()); + } + return null; } /*