diff --git a/thingamajig_disasm.py b/thingamajig_disasm.py
index 2cf0a9b..e764d68 100644
--- a/thingamajig_disasm.py
+++ b/thingamajig_disasm.py
@@ -45,6 +45,7 @@ def segment(binary, origin):
 		valid = True
 		if not opcodes[opcode].rx and rx != 0: valid = False
 		if not opcodes[opcode].ry and ry != 0: valid = False
+		if opcodes[opcode].addr and ip + 2 >= len(binary): valid = False
 
 		if not valid:
 			raw = binary[ip:ip + 1]