diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
index 39cc95a1539..d430a497bb2 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java
@@ -316,10 +316,12 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		foInfoPaths.add(path);
 		
 		Map toolPathsMap = tcApplicabilityPaths.fToolPathMap;
-		for(Iterator iter = toolSet.iterator(); iter.hasNext(); ){
-			Set set = new HashSet();
-			toolPathsMap.put(iter.next(), set);
-			set.add(path);
+		if(toolSet != null){
+			for(Iterator iter = toolSet.iterator(); iter.hasNext(); ){
+				Set set = new HashSet();
+				toolPathsMap.put(iter.next(), set);
+				set.add(path);
+			}
 		}
 		
 		calculateChildPaths(pathMap, path, curTc, foInfoPaths, toolPathsMap, fileInfoPaths);