diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index 4410943a31..6cbab30b44 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -164,11 +164,13 @@ export default class Expression {
 								current_scope = current_scope.parent;
 							}
 
-							if (declaration && declaration.kind === 'const' && !deep) {
-								component.error(node as any, {
-									code: 'assignment-to-const',
-									message: 'You are assigning to a const'
-								});
+							if (declaration) {
+								if (declaration.kind === 'const' && !deep) {
+									component.error(node as any, {
+										code: 'assignment-to-const',
+										message: 'You are assigning to a const'
+									});
+								}
 							} else if (variable && variable.writable === false && !deep) {
 								component.error(node as any, {
 									code: 'assignment-to-const',
diff --git a/test/validator/samples/assignment-to-const-3/errors.json b/test/validator/samples/assignment-to-const-3/errors.json
new file mode 100644
index 0000000000..4842d55dc3
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-3/errors.json
@@ -0,0 +1,17 @@
+[
+	{
+		"code": "assignment-to-const",
+		"message": "You are assigning to a const",
+		"start": {
+			"line": 14,
+			"column": 3,
+			"character": 172
+		},
+		"end": {
+			"line": 14,
+			"column": 10,
+			"character": 179
+		},
+		"pos": 172
+	}
+]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-3/input.svelte b/test/validator/samples/assignment-to-const-3/input.svelte
new file mode 100644
index 0000000000..faaf448823
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-3/input.svelte
@@ -0,0 +1,20 @@
+<script>
+	const foo = 'hello';
+	
+	function shouldNotError() {
+		let foo = 0;
+		
+		function inner() {
+			foo = 1;
+		}
+	}
+	
+	function shouldError() {
+		function inner() {
+			foo = 1;
+		}
+	}
+</script>
+
+<button on:click={shouldNotError}>click</button>
+<button on:click={shouldError}>click</button>
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-4/errors.json b/test/validator/samples/assignment-to-const-4/errors.json
new file mode 100644
index 0000000000..aa97538a60
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-4/errors.json
@@ -0,0 +1,17 @@
+[
+	{
+		"code": "assignment-to-const",
+		"message": "You are assigning to a const",
+		"start": {
+			"line": 17,
+			"column": 2,
+			"character": 189
+		},
+		"end": {
+			"line": 17,
+			"column": 9,
+			"character": 196
+		},
+		"pos": 189
+	}
+]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-4/input.svelte b/test/validator/samples/assignment-to-const-4/input.svelte
new file mode 100644
index 0000000000..12229132bf
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-4/input.svelte
@@ -0,0 +1,21 @@
+<script>
+	const foo = 'hello';
+</script>
+
+<button on:click={() => {
+	let foo = 0;
+		
+	function inner() {
+		foo = 1;
+	}
+}}>
+	click
+</button>
+
+<button on:click={() => {
+	function inner() {
+		foo = 1;
+	}
+}}>
+	click
+</button>
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const/errors.json b/test/validator/samples/assignment-to-const/errors.json
index 9e673499f0..7f4f264f1d 100644
--- a/test/validator/samples/assignment-to-const/errors.json
+++ b/test/validator/samples/assignment-to-const/errors.json
@@ -5,13 +5,13 @@
 		"start": {
 			"line": 16,
 			"column": 2,
-			"character": 237
+			"character": 225
 		},
 		"end": {
 			"line": 16,
 			"column": 18,
-			"character": 253
+			"character": 241
 		},
-		"pos": 237
+		"pos": 225
 	}
 ]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const/input.svelte b/test/validator/samples/assignment-to-const/input.svelte
index fa688a1202..d570e7c86b 100644
--- a/test/validator/samples/assignment-to-const/input.svelte
+++ b/test/validator/samples/assignment-to-const/input.svelte
@@ -4,21 +4,21 @@
 	const obj1 = { prop: true };
 	const obj2 = { prop: 0 };
 
-	function funcShouldNotError() {
+	function shouldNotError() {
 		obj1.prop = false;
 	}
 
-	function funcShouldNotError2() {
+	function shouldNotError2() {
 		obj2.prop++;
 	}
 
-	function funcShouldError() {
+	function shouldError() {
 		immutable = true
 	}
 
 	
 </script>
 
-<button on:click={funcShouldNotError}>click</button>
-<button on:click={funcShouldNotError2}>click</button>
-<button on:click={funcShouldError}>click</button>
+<button on:click={shouldNotError}>click</button>
+<button on:click={shouldNotError2}>click</button>
+<button on:click={shouldError}>click</button>