diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index e4c8e1dc9a3..39383bfea09 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -1311,6 +1311,8 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
 	}
 	
 	private void preDeleteProject(IProject project) {
+		// remove binary parsers
+		binaryParsersMap.remove(project);
 		// stop the binary runner for this project
 		removeBinaryRunner(project);
 		// stop indexing jobs for this project