diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerUtils.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerUtils.java
index d22371046b..ec3c7cebc4 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerUtils.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerUtils.java
@@ -343,7 +343,9 @@ public class DecompilerUtils {
 		if (token instanceof ClangFuncNameToken) {
 			// special case: we know that name tokens do not have addresses
 			Function function = getFunction(program, (ClangFuncNameToken) token);
-			return function.getEntryPoint();
+			if (function != null) {
+				return function.getEntryPoint();
+			}
 		}
 
 		Address address = token.getMinAddress();
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionPcodeOverride.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionPcodeOverride.java
index 2d639cfcd8..5d5b60e8d1 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionPcodeOverride.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionPcodeOverride.java
@@ -47,7 +47,7 @@ public class InstructionPcodeOverride implements PcodeOverride {
 
 		primaryOverridingReferences = new ArrayList<>();
 		for (Reference ref : instr.getReferencesFrom()) {
-			if (!ref.isPrimary()) {
+			if (!ref.isPrimary() || !ref.getToAddress().isMemoryAddress()) {
 				continue;
 			}
 			RefType type = ref.getReferenceType();