diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceDescriptionHolder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceDescriptionHolder.java
index d1749bb974b..c8339b45e07 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceDescriptionHolder.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceDescriptionHolder.java
@@ -59,7 +59,7 @@ public class ResourceDescriptionHolder {
 			public boolean visit(PathSettingsContainer container) {
 				ICResourceDescription des = (ICResourceDescription)container.getValue();
 				if((container != fPathSettingContainer || fIncludeCurrent)
-						&& (kind & des.getType()) == des.getType()){
+						&& des != null && (kind & des.getType()) == des.getType()){
 					list.add(des);
 				}
 				return true;