diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
index ac731840faa..cbfbb2a86ff 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
@@ -195,7 +195,7 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
 	    if( CharArrayUtils.equals( n, compType.getName().toCharArray() ) ){
 	        return (IBinding[]) ArrayUtil.addAll( IBinding.class, null, getConstructors() );
 	    }
-	    if( bindings.containsKey( n ) ){
+	    if( bindings != null && bindings.containsKey( n ) ){
 	        Object o = bindings.get( n );
 	        if( o instanceof IBinding[] )
 	            return (IBinding[]) ArrayUtil.trim( IBinding.class, (Object[]) o );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java
index eaaca75529e..87abfc9ad4a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java
@@ -97,7 +97,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPNamespaceScope{
 	 */
 	public IBinding[] find(String name) {
 	    char [] n = name.toCharArray();
-	    if( bindings.isFullyResolved( n ) ){
+	    if( bindings != null && bindings.isFullyResolved( n ) ){
 	        Object o = bindings.get( n );
 	        if( o instanceof IBinding[] )
 	            return (IBinding[]) ArrayUtil.trim( IBinding.class, (Object[]) o );