diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
index d5b07e14..6d4b5cad 100644
--- a/src/CppParser/Parser.cpp
+++ b/src/CppParser/Parser.cpp
@@ -2525,12 +2525,13 @@ ParserResult* Parser::ParseHeader(const std::string& File)
 
     auto FileName = FileEntry->getName();
     auto Unit = Lib->FindOrCreateModule(FileName);
-    if (Unit->OriginalPtr == nullptr)
-        Unit->OriginalPtr = (void*) FileEntry;
 
     auto TU = AST->getTranslationUnitDecl();
     HandleDeclaration(TU, Unit);
 
+    if (Unit->OriginalPtr == nullptr)
+        Unit->OriginalPtr = (void*) FileEntry;
+
     // Initialize enough Clang codegen machinery so we can get at ABI details.
     llvm::LLVMContext Ctx;
     llvm::OwningPtr<llvm::Module> M(new llvm::Module("", Ctx));