diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 2c3133de6f5..a0f593e5111 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -1204,7 +1204,7 @@ namespace ts {
             }
 
             if (hasModifier(decl, ModifierFlags.Export)) {
-                const exportName = hasModifier(decl, ModifierFlags.Default) ? createIdentifier("default") : decl.name;
+                const exportName = hasModifier(decl, ModifierFlags.Default) ? createIdentifier("default") : getDeclarationName(decl);
                 statements = appendExportStatement(statements, exportName, getLocalName(decl), /*location*/ decl);
             }
 
diff --git a/src/compiler/transformers/utilities.ts b/src/compiler/transformers/utilities.ts
index be99df62b67..f641ee49faf 100644
--- a/src/compiler/transformers/utilities.ts
+++ b/src/compiler/transformers/utilities.ts
@@ -124,7 +124,7 @@ namespace ts {
                         else {
                             // export class x { }
                             const name = (<ClassDeclaration>node).name;
-                            if (!uniqueExports.get(unescapeLeadingUnderscores(name.escapedText))) {
+                            if (name && !uniqueExports.get(unescapeLeadingUnderscores(name.escapedText))) {
                                 multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name);
                                 uniqueExports.set(unescapeLeadingUnderscores(name.escapedText), true);
                                 exportedNames = append(exportedNames, name);
diff --git a/tests/baselines/reference/exportClassWithoutName.errors.txt b/tests/baselines/reference/exportClassWithoutName.errors.txt
new file mode 100644
index 00000000000..448a1b2bb03
--- /dev/null
+++ b/tests/baselines/reference/exportClassWithoutName.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/compiler/exportClassWithoutName.ts(1,1): error TS1211: A class declaration without the 'default' modifier must have a name.
+
+
+==== tests/cases/compiler/exportClassWithoutName.ts (1 errors) ====
+    export class {
+    ~~~~~~
+!!! error TS1211: A class declaration without the 'default' modifier must have a name.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportClassWithoutName.js b/tests/baselines/reference/exportClassWithoutName.js
new file mode 100644
index 00000000000..45b4301a812
--- /dev/null
+++ b/tests/baselines/reference/exportClassWithoutName.js
@@ -0,0 +1,10 @@
+//// [exportClassWithoutName.ts]
+export class {
+}
+
+//// [exportClassWithoutName.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class default_1 {
+}
+exports.default_1 = default_1;
diff --git a/tests/cases/compiler/exportClassWithoutName.ts b/tests/cases/compiler/exportClassWithoutName.ts
new file mode 100644
index 00000000000..a83ca9758c7
--- /dev/null
+++ b/tests/cases/compiler/exportClassWithoutName.ts
@@ -0,0 +1,4 @@
+//@module: commonjs
+//@target: es2015
+export class {
+}
\ No newline at end of file