diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexer.java
index 00e3adb4c14..28cacfba513 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexer.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexer.java
@@ -456,11 +456,11 @@ public class SourceIndexer extends AbstractCExtension implements ICDTIndexer {
 		    
 		switch (kind) {
 			case ICDTIndexer.PROJECT :
-				this.indexAll(project);
+					this.indexAll(project);
 				break;
 	        
 			case ICDTIndexer.FOLDER : 
-				this.indexSourceFolder(project,project.getFullPath(),null);
+				this.indexSourceFolder(project,delta.getFullPath(),null);
 			break;
 			
 			case ICDTIndexer.COMPILATION_UNIT:
@@ -488,7 +488,7 @@ public class SourceIndexer extends AbstractCExtension implements ICDTIndexer {
 				//     is done in updateCurrentDeltaAndIndex
 			
 			case ICDTIndexer.FOLDER :
-				this.removeSourceFolderFromIndex(project,project.getFullPath(),null);
+				this.removeSourceFolderFromIndex(project,delta.getFullPath(),null);
 				break;
 			
 			case ICDTIndexer.COMPILATION_UNIT:
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/SourceIndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/SourceIndexerBlock.java
index d7cfdd363c6..a6d0e2fa814 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/SourceIndexerBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/SourceIndexerBlock.java
@@ -105,6 +105,11 @@ public class SourceIndexerBlock extends AbstractIndexerPage {
 			}
 		}
 
+		//Project has just been created and its values have been store - don't need to request 
+		//an indexAll as one will come through the DeltaProcessor
+		if (currentProject == null)
+			return;
+		
         ICDTIndexer indexer = CCorePlugin.getDefault().getCoreModel().getIndexManager().getIndexerForProject(currentProject);
 
         int indexMarkersInt = Integer.parseInt(indexMarkers);