diff --git a/src/compiler/parse/index.ts b/src/compiler/parse/index.ts
index 04025ae0fc..f378fced41 100644
--- a/src/compiler/parse/index.ts
+++ b/src/compiler/parse/index.ts
@@ -177,9 +177,9 @@ export class Parser {
 		return identifier;
 	}
 
-	read_until(pattern: RegExp) {
+	read_until(pattern: RegExp, error?: {code: string; message: string}) {
 		if (this.index >= this.template.length)
-			this.error({
+			this.error(error || {
 				code: `unexpected-eof`,
 				message: 'Unexpected end of input'
 			});
diff --git a/src/compiler/parse/read/script.ts b/src/compiler/parse/read/script.ts
index 3fadab9fbe..6a719250ef 100644
--- a/src/compiler/parse/read/script.ts
+++ b/src/compiler/parse/read/script.ts
@@ -28,16 +28,15 @@ function get_context(parser: Parser, attributes: any[], start: number): string {
 
 export default function read_script(parser: Parser, start: number, attributes: Node[]): Script {
 	const script_start = parser.index;
-	const script_end = /<\/script\s*>/.exec(parser.template.slice(script_start));
-	
-	if (!script_end) parser.error({
+	const error_message ={
 		code: `unclosed-script`,
 		message: `<script> must have a closing tag`
-	});
+	};
+	const [data, matched] = parser.read_until(/<\/script\s*>/, error_message);
 
-	const source = parser.template.slice(0, script_start).replace(/[^\n]/g, ' ') +
-		parser.template.slice(script_start, script_end.index + script_start);
-	parser.index = script_end.index + script_end[0].length + script_start ;
+	if (!matched) parser.error(error_message);
+
+	const source = parser.template.slice(0, script_start).replace(/[^\n]/g, ' ') + data;
 	
 	let ast: Program;
 
@@ -50,6 +49,8 @@ export default function read_script(parser: Parser, start: number, attributes: N
 	// TODO is this necessary?
 	(ast as any).start = script_start;
 
+	parser.eat(matched, true);
+
 	return {
 		type: 'Script',
 		start,
diff --git a/src/compiler/parse/read/style.ts b/src/compiler/parse/read/style.ts
index 349110ec6c..b4500b0454 100644
--- a/src/compiler/parse/read/style.ts
+++ b/src/compiler/parse/read/style.ts
@@ -6,9 +6,15 @@ import { Style } from '../../interfaces';
 
 export default function read_style(parser: Parser, start: number, attributes: Node[]): Style {
 	const content_start = parser.index;
-	const [styles, matched] = parser.read_until(/<\/style\s*>/);
+	const error_message ={
+		code: `unclosed-style`,
+		message: `<style> must have a closing tag`
+	};
+	const [styles, matched] = parser.read_until(/<\/style\s*>/, error_message);
 	const content_end = parser.index;
 
+	if (!matched) parser.error(error_message);
+
 	let ast;
 
 	try {
@@ -70,12 +76,11 @@ export default function read_style(parser: Parser, start: number, attributes: No
 	});
 
 	parser.eat(matched, true);
-	const end = parser.index;
 
 	return {
 		type: 'Style',
 		start,
-		end,
+		end: parser.index,
 		attributes,
 		children: ast.children,
 		content: {
diff --git a/test/parser/samples/error-style-unclosed-eof/error.json b/test/parser/samples/error-style-unclosed-eof/error.json
new file mode 100644
index 0000000000..28da4931bc
--- /dev/null
+++ b/test/parser/samples/error-style-unclosed-eof/error.json
@@ -0,0 +1,10 @@
+{
+	"code": "unclosed-style",
+	"message": "<style> must have a closing tag",
+	"start": {
+		"line": 3,
+		"column": 22,
+		"character": 31
+	},
+	"pos": 31
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-style-unclosed-eof/input.svelte b/test/parser/samples/error-style-unclosed-eof/input.svelte
new file mode 100644
index 0000000000..4c12744313
--- /dev/null
+++ b/test/parser/samples/error-style-unclosed-eof/input.svelte
@@ -0,0 +1,3 @@
+<style>
+
+<h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/parser/samples/error-style-unclosed/error.json b/test/parser/samples/error-style-unclosed/error.json
new file mode 100644
index 0000000000..02f32c273d
--- /dev/null
+++ b/test/parser/samples/error-style-unclosed/error.json
@@ -0,0 +1,10 @@
+{
+	"code": "unclosed-style",
+	"message": "<style> must have a closing tag",
+	"start": {
+		"line": 3,
+		"column": 7,
+		"character": 31
+	},
+	"pos": 31
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-style-unclosed/input.svelte b/test/parser/samples/error-style-unclosed/input.svelte
new file mode 100644
index 0000000000..a33bc1dfaf
--- /dev/null
+++ b/test/parser/samples/error-style-unclosed/input.svelte
@@ -0,0 +1,3 @@
+<h1>Hello {name}!</h1>
+
+<style>
\ No newline at end of file