diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
index de85303c219..bc6262f65d4 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
@@ -179,6 +179,10 @@ public abstract class CElement extends PlatformObject implements ICElement {
 			return true;
 		if (o instanceof CElement) {
 			CElement other = (CElement) o;
+			if( fName == null  || other.fName == null ) 
+				return false;
+			if( fName.length() == 0  || other.fName.length() == 0 ) 
+				return false;
 			if (fType != other.fType)
 				return false;
 			if (other.fName != null && fName.equals(other.fName)) {