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 list = prototype.getOpRepresentationList(opIndex, instruction.getInstructionContext()); + if (list == null) { + return null; + } return list.get(loc.getSubOperandIndex()); }