diff --git a/llvm/lib/MC/MCDisassembler/EDInst.cpp b/llvm/lib/MC/MCDisassembler/EDInst.cpp
index 63b049f..6057e16 100644
--- a/llvm/lib/MC/MCDisassembler/EDInst.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDInst.cpp
@@ -165,6 +165,9 @@
 int EDInst::tokenize() {
   if (TokenizeResult.valid())
     return TokenizeResult.result();
+    
+  if (ThisInstInfo == NULL)
+    return TokenizeResult.setResult(-1);
   
   if (stringify())
     return TokenizeResult.setResult(-1);