diff --git a/clang/lib/Index/Entity.cpp b/clang/lib/Index/Entity.cpp
index 85b4f2e..d331100 100644
--- a/clang/lib/Index/Entity.cpp
+++ b/clang/lib/Index/Entity.cpp
@@ -59,11 +59,12 @@
     return Entity(D);
 
   // FIXME: Only works for DeclarationNames that are identifiers.
+  // Treats other DeclarationNames as internal Decls for now..
 
   DeclarationName Name = D->getDeclName();
 
   if (!Name.isIdentifier())
-    return Entity();
+    return Entity(D);
 
   IdentifierInfo *II = Name.getAsIdentifierInfo();
   if (!II)