diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 5781875ac9b..b577f66b978 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1047,7 +1047,8 @@ module ts {
                     // Emit identifier as an identifier
                     emit(node.name);
                     write(": ");
-                    // Even though this is stored as identified because it is in short-hand property assignment, treated it as expression 
+                    // Even though this is stored as identified because it is in short-hand property assignment,
+                    // treated it as expression 
                     emitExpressionIdentifier(node.name);
                     emitTrailingComments(node);
                 }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 2fe3b8aa670..43e6aee153c 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2687,6 +2687,7 @@ module ts {
                 (<PropertyDeclaration>node).initializer = makeFunctionExpression(SyntaxKind.FunctionExpression, node.pos, undefined, sig, body);
                 return finishNode(node);
             }
+            // Disallow optional property assignment
             if (token === SyntaxKind.QuestionToken) {
                 var questionStart = scanner.getTokenPos();
                 grammarErrorAtPos(questionStart, scanner.getStartPos() - questionStart, Diagnostics.A_object_member_cannot_be_declared_optional);
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
index 0a317d70f10..3c5f4e97d80 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
@@ -11,13 +11,14 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(16,6): error TS1005: ',' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(17,6): error TS1005: '=' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(18,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(20,17): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(5,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(15,5): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(15,7): error TS2304: Cannot find name 'b'.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(16,5): error TS2300: Duplicate identifier 'a'.
 
 
-==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts (17 errors) ====
+==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts (18 errors) ====
     // errors
     var y = {
         "stringLiteral",
@@ -69,4 +70,8 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
 !!! error TS1005: '=' expected.
     };
     ~
-!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
+!!! error TS1128: Declaration or statement expected.
+    
+    var v = { class };  // error
+                    ~
+!!! error TS1005: ':' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt
new file mode 100644
index 00000000000..f5fd8ed53f2
--- /dev/null
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts(10,10): error TS1005: ',' expected.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts(14,3): error TS2339: Property 'y' does not exist on type 'typeof m'.
+
+
+==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts (2 errors) ====
+    // module export
+    var x = "Foo";
+    module m {
+        export var x;
+    }
+    
+    module n {
+        var z = 10000;
+        export var y = {
+            m.x  // error
+             ~
+!!! error TS1005: ',' expected.
+        };
+    }
+    
+    m.y.x;
+      ~
+!!! error TS2339: Property 'y' does not exist on type 'typeof m'.
+    
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts
index 38081e7d691..527154c66bd 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts
@@ -15,4 +15,6 @@ var x = {
     a.b,
     a["ss"],
     a[1],
-};
\ No newline at end of file
+};
+
+var v = { class };  // error
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts
new file mode 100644
index 00000000000..7da6e7b0c70
--- /dev/null
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts
@@ -0,0 +1,14 @@
+// module export
+var x = "Foo";
+module m {
+    export var x;
+}
+
+module n {
+    var z = 10000;
+    export var y = {
+        m.x  // error
+    };
+}
+
+m.y.x;
diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts
index 3f609089e2c..005885bb901 100644
--- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts
+++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts
@@ -1,14 +1,13 @@
 // module export
-var x = "Foo";
+
 module m {
     export var x;
 }
 
 module m {
-    var z = 10000;
-    export var y = {
+    var z = x;
+    var y = {
+        a: x,
         x
     };
 }
-
-m.y.x;