diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index 7c0e6d43897..1a7e3d5e56b 100644
--- a/lib/Bytecode/Reader/Reader.cpp
+++ b/lib/Bytecode/Reader/Reader.cpp
@@ -642,6 +642,7 @@ Module *BytecodeParser::ParseBytecode(const unsigned char *Buf,
 
   TheModule = new Module(ModuleID);
   if (ParseModule(Buf, EndBuf)) {
+    freeState();       // Must destroy handles before deleting module!
     delete TheModule;
     TheModule = 0;
   }
diff --git a/lib/Bytecode/Reader/ReaderInternals.h b/lib/Bytecode/Reader/ReaderInternals.h
index 6709bc2d4d6..a8ee6fc8b94 100644
--- a/lib/Bytecode/Reader/ReaderInternals.h
+++ b/lib/Bytecode/Reader/ReaderInternals.h
@@ -45,6 +45,9 @@ public:
     FirstDerivedTyID = Type::FirstDerivedTyID;
   }
   ~BytecodeParser() {
+    freeState();
+  }
+  void freeState() {
     freeTable(Values);
     freeTable(LateResolveValues);
     freeTable(ModuleValues);