diff --git a/clang/lib/Index/Entity.cpp b/clang/lib/Index/Entity.cpp
index 520d189..ca2e7c8 100644
--- a/clang/lib/Index/Entity.cpp
+++ b/clang/lib/Index/Entity.cpp
@@ -56,6 +56,9 @@
     return 0;
 
   IdentifierInfo *II = Name.getAsIdentifierInfo();
+  if (!II)
+      return 0;
+
   ProgramImpl::IdEntryTy *Id =
       &Prog.getIdents().GetOrCreateValue(II->getName(),
                                          II->getName() + II->getLength());