diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
index 8fccb43ba2f..cd2714014f1 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
@@ -486,7 +486,8 @@ public class IndexManager extends JobManager{
         
 		//Get rid of the old index file
 	    ICDTIndexer currentIndexer = getIndexerForProject(project);
-		
+		if (currentIndexer == null)
+			return;
 		currentIndexer.indexerRemoved(project);
 		
 	    IIndexStorage storage = currentIndexer.getIndexStorage();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
index db287beb64e..8f3838c1086 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
@@ -87,7 +87,9 @@ public class PDOMManager implements IPDOMManager, IElementChangedListener {
 			// Find the appropriate indexer and pass the delta on
 			ICProject project = (ICProject)delta.getElement();
 			IPDOM pdom = getPDOM(project);
-			pdom.getIndexer().handleDelta(delta);
+			if (pdom != null)
+				// TODO project delete, should do something fancier here.
+				pdom.getIndexer().handleDelta(delta);
 		}
 	}