diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
index 6ba693082fb..b20b69f77a7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
@@ -101,10 +101,12 @@ public class CHContentProvider extends AsyncTreeContentProvider {
 			ICElement[] elements= calledBy.getElements();
 			for (int i = 0; i < elements.length; i++) {
 				ICElement element = elements[i];
-				CIndexReference[] refs= calledBy.getReferences(element);
-				if (refs != null && refs.length > 0) {
-					CHNode node = createRefbyNode(parent, element, refs);
-					result.add(node);
+				if (element != null) {
+					CIndexReference[] refs= calledBy.getReferences(element);
+					if (refs != null && refs.length > 0) {
+						CHNode node = createRefbyNode(parent, element, refs);
+						result.add(node);
+					}
 				}
 			}
 			return result.toArray();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/missingapi/CIndexQueries.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/missingapi/CIndexQueries.java
index 53b82a473b3..6dd7271e003 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/missingapi/CIndexQueries.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/missingapi/CIndexQueries.java
@@ -223,7 +223,7 @@ public class CIndexQueries {
 					IASTName[] names= pdom.getReferences(binding);
 					for (int i = 0; i < names.length; i++) {
 						IASTName rname = names[i];
-						ITranslationUnit tu= toTranslationUnit(project, name);
+						ITranslationUnit tu= toTranslationUnit(project, rname);
 						CIndexReference ref= new CIndexReference(tu, rname);
 						ICElement elem= findCaller(ref);
 						result.add(elem, ref);