diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighParserContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighParserContext.java
index d37931e5c8..b4603190a9 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighParserContext.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighParserContext.java
@@ -86,6 +86,7 @@ public class SleighParserContext implements ParserContext {
 		nextInstrAddr = nAddr;
 		refAddr = rAddr;
 		destAddr = dAddr;
+		handleMap = new HashMap<>();
 	}
 
 	/**