diff --git a/duchain/builders/typebuilder.cpp b/duchain/builders/typebuilder.cpp
--- a/duchain/builders/typebuilder.cpp
+++ b/duchain/builders/typebuilder.cpp
@@ -514,12 +514,15 @@
                 if (classDec->isPublicBaseClass(iteratorDecl, currentContext()->topContext())) {
                     /// Qualified identifier for 'current'
                     static const QualifiedIdentifier currentQId(QStringLiteral("current"));
-                    foreach (Declaration *d, classDec->internalContext()->findDeclarations(currentQId)) {
-                        if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue;
-                        Q_ASSERT(d->type<FunctionType>());
-                        injectType(d->type<FunctionType>()->returnType());
-                        foundType = true;
-                        // qCDebug(DUCHAIN) << "that's it: " << d->type<FunctionType>()->returnType()->toString();
+                    auto classContext = classDec->internalContext();
+                    if (classContext) {
+                        foreach (Declaration *d, classContext->findDeclarations(currentQId)) {
+                            if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue;
+                            Q_ASSERT(d->type<FunctionType>());
+                            injectType(d->type<FunctionType>()->returnType());
+                            foundType = true;
+                            // qCDebug(DUCHAIN) << "that's it: " << d->type<FunctionType>()->returnType()->toString();
+                        }
                     }
                 }
             }
diff --git a/duchain/tests/duchain_multiplefiles.h b/duchain/tests/duchain_multiplefiles.h
--- a/duchain/tests/duchain_multiplefiles.h
+++ b/duchain/tests/duchain_multiplefiles.h
@@ -45,6 +45,7 @@
     void testForeachImportedIdentifier();
     void testUpdateForeach();
     void testTodoExtractorReparse();
+    void testIteratorForeachReparse();
 private:
     KDevelop::TestProjectController* m_projectController;
 };
diff --git a/duchain/tests/duchain_multiplefiles.cpp b/duchain/tests/duchain_multiplefiles.cpp
--- a/duchain/tests/duchain_multiplefiles.cpp
+++ b/duchain/tests/duchain_multiplefiles.cpp
@@ -30,6 +30,7 @@
 #include <tests/testfile.h>
 #include <language/duchain/declaration.h>
 #include <language/duchain/problem.h>
+#include <language/duchain/types/integraltype.h>
 
 QTEST_MAIN(Php::TestDUChainMultipleFiles)
 
@@ -294,3 +295,30 @@
         QCOMPARE(top->problems().at(0)->range(), RangeInRevision(2, 3, 2, 7));
     }
 }
+
+void TestDUChainMultipleFiles::testIteratorForeachReparse() {
+    TestFile file(QStringLiteral("<?php\n/*\n\n/*\n*/\nforeach (new A() as $a) {}\nclass A implements Iterator {\npublic function current() { return 0; }\n}"), QStringLiteral("php"));
+
+    auto features = TopDUContext::AllDeclarationsAndContexts;
+
+    for (int i = 0; i < 2; ++i) {
+        if (i == 1) {
+            file.setFileContents(QStringLiteral("<?php\n/*\n*/\n\n/*\n*/\nforeach (new A() as $a) {}\nclass A implements Iterator {\npublic function current() { return 0; }\n}"));
+            features = static_cast<TopDUContext::Features>(features | TopDUContext::ForceUpdate);
+        }
+
+        file.parse(features);
+        QVERIFY(file.waitForParsed());
+
+        DUChainReadLocker lock;
+        auto top = file.topContext();
+        QVERIFY(top);
+        QVERIFY(top->localDeclarations().size() == 2);
+        QCOMPARE(top->localDeclarations().at(0)->qualifiedIdentifier(), QualifiedIdentifier("a"));
+
+        IntegralType::Ptr type = top->localDeclarations().at(0)->type<IntegralType>();
+        QVERIFY(type);
+        //Should actually parse as an TypeInt, but this does not work.
+        QVERIFY(type->dataType() == IntegralType::TypeMixed);
+    }
+}