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 002e6d4ddde..8fccb43ba2f 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
@@ -228,9 +228,10 @@ public class IndexManager extends JobManager{
 	 */
 	public void removeResourceEvent(IProject project, IResourceDelta delta, int kind) {
 		//Get the indexer for this project
-		ICDTIndexer indexer = null;
-		indexer = (ICDTIndexer) indexerMap.get(project);
+		if (indexerMap == null)
+			return;
 		
+		ICDTIndexer indexer = (ICDTIndexer) indexerMap.get(project);
 		if (indexer != null)
 			indexer.removeRequest(project, delta, kind);
 	}