diff --git a/src/services/services.ts b/src/services/services.ts
index 648cc6c8320..24e85a2a019 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -107,12 +107,14 @@ namespace ts {
             scanner.setTextPos(pos);
             while (pos < end) {
                 const token = scanner.scan();
-                Debug.assert(token !== SyntaxKind.EndOfFileToken); // Else it would infinitely loop
                 const textPos = scanner.getTextPos();
                 if (textPos <= end) {
                     nodes.push(createNode(token, pos, textPos, this));
                 }
                 pos = textPos;
+                if (token === SyntaxKind.EndOfFileToken) {
+                    return pos;
+                }
             }
             return pos;
         }