diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 34b49c5b07d..7c6942960ad 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1010,7 +1010,10 @@ module ts {
         function createNode(kind: SyntaxKind, pos?: number): Node {
             nodeCount++;
             var node = new (nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind)))();
-            if (!(pos >= 0)) pos = scanner.getStartPos();
+            if (!(pos >= 0)) {
+                pos = scanner.getStartPos();
+            }
+
             node.pos = pos;
             node.end = pos;
             return node;
@@ -2225,16 +2228,21 @@ module ts {
                     // the code would be implicitly: "name.keyword; identifierNameOrKeyword".  
                     // In the first case though, ASI will not take effect because there is not a
                     // line terminator after the keyword.
-                    if (scanner.hasPrecedingLineBreak() && scanner.isReservedWord() && lookAhead(() => scanner.isReservedWord())) {
-                        grammarErrorAtPos(dotOrBracketStart, scanner.getStartPos() - dotOrBracketStart, Diagnostics.Identifier_expected);
-                        var id = <Identifier>createMissingNode();
-                    }
-                    else {
-                        var id = parseIdentifierName();
+                    var id: Identifier;
+                    if (scanner.hasPrecedingLineBreak() && scanner.isReservedWord()) {
+                        var matchesPattern = lookAhead(() => {
+                            nextToken();
+                            return !scanner.hasPrecedingLineBreak() && (scanner.isIdentifier() || scanner.isReservedWord);
+                        });
+
+                        if (matchesPattern) {
+                            errorAtPos(dotOrBracketStart + 1, 0, Diagnostics.Identifier_expected);
+                            id = <Identifier>createMissingNode();
+                        }
                     }
 
                     propertyAccess.left = expr;
-                    propertyAccess.right = id;
+                    propertyAccess.right = id || parseIdentifierName();
                     expr = finishNode(propertyAccess);
                     continue;
                 }
diff --git a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.errors.txt b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.errors.txt
index 235b665cdc0..e6859558f74 100644
--- a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.errors.txt
+++ b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/enumConflictsWithGlobalIdentifier.ts(4,28): error TS1003: Identifier expected.
+tests/cases/compiler/enumConflictsWithGlobalIdentifier.ts(4,29): error TS1003: Identifier expected.
 tests/cases/compiler/enumConflictsWithGlobalIdentifier.ts(4,9): error TS2304: Cannot find name 'IgnoreRulesSpecific'.
 
 
@@ -7,7 +7,7 @@ tests/cases/compiler/enumConflictsWithGlobalIdentifier.ts(4,9): error TS2304: Ca
         IgnoreRulesSpecific = 0,
     }
     var x = IgnoreRulesSpecific.
-                               ~
+                                
 !!! error TS1003: Identifier expected.
             ~~~~~~~~~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'IgnoreRulesSpecific'.
diff --git a/tests/baselines/reference/enumMemberResolution.errors.txt b/tests/baselines/reference/enumMemberResolution.errors.txt
index 5c84c08d984..f446c0d7909 100644
--- a/tests/baselines/reference/enumMemberResolution.errors.txt
+++ b/tests/baselines/reference/enumMemberResolution.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/enumMemberResolution.ts(4,28): error TS1003: Identifier expected.
+tests/cases/compiler/enumMemberResolution.ts(4,29): error TS1003: Identifier expected.
 tests/cases/compiler/enumMemberResolution.ts(4,9): error TS2304: Cannot find name 'IgnoreRulesSpecific'.
 
 
@@ -7,7 +7,7 @@ tests/cases/compiler/enumMemberResolution.ts(4,9): error TS2304: Cannot find nam
         IgnoreRulesSpecific = 0
     }
     var x = IgnoreRulesSpecific. // error
-                               ~
+                                
 !!! error TS1003: Identifier expected.
             ~~~~~~~~~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'IgnoreRulesSpecific'.