diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java
index 7c9f13d013..b6d12f98b3 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java
@@ -139,7 +139,7 @@ public class ImageRuntimeFunctionEntries_X86 implements ImageRuntimeFunctionEntr
 		public void markup(Program program, MessageLog log)
 				throws DuplicateNameException, IOException {
 			
-			if (beginAddress != 0 && !unwindInfo.hasChainedUnwindInfo()) {
+			if (beginAddress != 0 && (unwindInfo == null || !unwindInfo.hasChainedUnwindInfo())) {
 				AbstractProgramLoader.markAsFunction(program, null,
 					program.getImageBase().add(beginAddress));
 			}