diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
index eec83f2b2c2..495851d6188 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
@@ -48,7 +48,8 @@ public class PDOMSearchTextSelectionQuery extends PDOMSearchQuery {
 			
 			for (int i = 0; i < names.length; ++i) {
 				IBinding binding = names[i].resolveBinding();
-				createMatches(language, binding);
+				if (binding != null)
+					createMatches(language, binding);
 			}
 			return Status.OK_STATUS;
 		} catch (CoreException e) {