From 7ccfc4ba5223f67830e50d1b2214dc006a2c8eac Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Fri, 20 Sep 2019 15:48:20 -0400
Subject: [PATCH] Fixed NullPointerException in ScalarOperandListingHover

---
 .../core/codebrowser/hover/ScalarOperandListingHover.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/ScalarOperandListingHover.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/ScalarOperandListingHover.java
index cd76cf9112..5d4575d1e0 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/ScalarOperandListingHover.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/ScalarOperandListingHover.java
@@ -100,6 +100,9 @@ public class ScalarOperandListingHover extends AbstractScalarOperandHover
 		InstructionPrototype prototype = instruction.getPrototype();
 		List<Object> list =
 			prototype.getOpRepresentationList(opIndex, instruction.getInstructionContext());
+		if (list == null) {
+			return null;
+		}
 		return list.get(loc.getSubOperandIndex());
 	}