diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index d24652b..7f227a0 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -1794,7 +1794,7 @@
     return cxloc::translateSourceLocation(getCursorContext(C), L);
   }
   
-  if (!getCursorDecl(C))
+  if (C.kind < CXCursor_FirstDecl || C.kind > CXCursor_LastDecl)
     return clang_getNullLocation();
 
   Decl *D = getCursorDecl(C);
@@ -1860,7 +1860,7 @@
     return cxloc::translateSourceRange(getCursorContext(C), R);
   }
   
-  if (!getCursorDecl(C))
+  if (C.kind < CXCursor_FirstDecl || C.kind > CXCursor_LastDecl)
     return clang_getNullRange();
 
   Decl *D = getCursorDecl(C);