diff --git a/interpreter/cling/lib/MetaProcessor/InputValidator.cpp b/interpreter/cling/lib/MetaProcessor/InputValidator.cpp
index 9c0dba3aaea25..ba833f375c53f 100644
--- a/interpreter/cling/lib/MetaProcessor/InputValidator.cpp
+++ b/interpreter/cling/lib/MetaProcessor/InputValidator.cpp
@@ -82,17 +82,19 @@ namespace cling {
       case tok::hash:
         Lex.SkipWhitespace();
         Lex.LexAnyString(Tok);
-        const llvm::StringRef PPtk = Tok.getIdent();
-        if (PPtk.startswith("if")) {
-          m_ParenStack.push_back(tok::hash);
-        } else if (PPtk.startswith("endif") &&
-                   (PPtk.size() == 5 || PPtk[5]=='/' || isspace(PPtk[5]))) {
+        if (Tok.isNot(tok::eof)) {
+          const llvm::StringRef PPtk = Tok.getIdent();
+          if (PPtk.startswith("if")) {
+            m_ParenStack.push_back(tok::hash);
+          } else if (PPtk.startswith("endif") &&
+                     (PPtk.size() == 5 || PPtk[5] == '/' || isspace(PPtk[5]))) {
             if (m_ParenStack.empty() || m_ParenStack.back() != tok::hash)
               Res = kMismatch;
             else
               m_ParenStack.pop_back();
+          }
+          break;
         }
-        break;
       }
     } while (Tok.isNot(tok::eof) && Res != kMismatch);
 
diff --git a/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp b/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp
index 03c1bc08e14fd..5fcc80133b77e 100644
--- a/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp
+++ b/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp
@@ -102,6 +102,13 @@ namespace cling {
   void MetaLexer::LexAnyString(Token& Tok) {
     Tok.startToken(curPos);
     // consume until we reach one of the "AnyString" delimiters or EOF.
+    if (*curPos == '\0') {
+      Tok.setBufStart(curPos);
+      Tok.setKind(tok::eof);
+      Tok.setLength(0);
+      return;
+    }
+
     while(*curPos != ' ' && *curPos != '\t' && *curPos != '\0') {
       curPos++;
     }