diff --git a/pwndbg/disasm/arch.py b/pwndbg/disasm/arch.py
index 2055c2826..41c292c9f 100644
--- a/pwndbg/disasm/arch.py
+++ b/pwndbg/disasm/arch.py
@@ -140,6 +140,10 @@ class DisassemblyAssistant(object):
         if op.type == CS_OP_REG:
             addr = self.register(instruction, op)
 
+        # Evidently this can happen?
+        if addr is None:
+            return None
+
         return int(addr)
 
     def enhance_symbol(self, instruction):