diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
index abeb51c1236..b44349ff649 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
@@ -204,6 +204,9 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
 	}
 	
 	public IValue getCompositeValue(IValue v) {
+		if (v == null)
+			return null;
+		
 		IBinding[] b= v.getUnknownBindings();
 		if (b.length == 0)
 			return v;