diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/index/AbstractIndexerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/index/AbstractIndexerPage.java
index 0c97d960b83..86b1d411f7b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/index/AbstractIndexerPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/index/AbstractIndexerPage.java
@@ -45,7 +45,7 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage {
    abstract public void removePreferences();
    
 	public IProject getCurrentProject() {
-		return currentProject.getProject();
+		return currentProject != null ? currentProject.getProject() : null;
 	}
 	
 	public void setCurrentProject(ICProject currentProject) {