From ff73f665897ca7d17a807a9f0c9ddb70cdbdc949 Mon Sep 17 00:00:00 2001
From: Zach Riggle <riggle@google.com>
Date: Wed, 1 Jun 2016 16:46:16 -0500
Subject: [PATCH] Fix bug reported by kavefish

---
 pwndbg/disasm/arch.py | 4 ++++
 1 file changed, 4 insertions(+)

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):