diff --git a/clang/tools/CIndex/CIndexUSRs.cpp b/clang/tools/CIndex/CIndexUSRs.cpp
index b35ca0bcaf62..2d623e33f601 100644
--- a/clang/tools/CIndex/CIndexUSRs.cpp
+++ b/clang/tools/CIndex/CIndexUSRs.cpp
@@ -340,7 +340,7 @@ static CXString getDeclCursorUSR(const CXCursor &C) {
 
   // Don't generate USRs for things with invalid locations.
   if (!D || D->getLocStart().isInvalid())
-    return createCXString(NULL);
+    return createCXString("");
 
   // Check if the cursor has 'NoLinkage'.
   if (const NamedDecl *ND = dyn_cast<NamedDecl>(D))
@@ -369,8 +369,6 @@ static CXString getDeclCursorUSR(const CXCursor &C) {
   if (SUG->ignoreResults())
     return createCXString("");
 
-  assert(SUG.str().size() > 3);
-
     // Return a copy of the string that must be disposed by the caller.
   return createCXString(SUG.str(), true);
 }