diff --git a/include/asm/fstack.h b/include/asm/fstack.h
index ace8237200..5c14222358 100644
--- a/include/asm/fstack.h
+++ b/include/asm/fstack.h
@@ -78,6 +78,7 @@ void fstk_RunMacro(char const *macroName, struct MacroArgs *args);
 void fstk_RunRept(uint32_t count, int32_t nReptLineNo, char *body, size_t size);
 void fstk_RunFor(char const *symName, int32_t start, int32_t stop, int32_t step,
 		     int32_t reptLineNo, char *body, size_t size);
+void fstk_StopRept(void);
 bool fstk_Break(void);
 
 void fstk_Init(char const *mainPath, size_t maxRecursionDepth);
diff --git a/src/asm/fstack.c b/src/asm/fstack.c
index 7416a667e7..a80d4f1732 100644
--- a/src/asm/fstack.c
+++ b/src/asm/fstack.c
@@ -501,6 +501,12 @@ void fstk_RunFor(char const *symName, int32_t start, int32_t stop, int32_t step,
 		fatalerror("Not enough memory for FOR symbol name: %s\n", strerror(errno));
 }
 
+void fstk_StopRept(void)
+{
+	/* Prevent more iterations */
+	contextStack->nbReptIters = 0;
+}
+
 bool fstk_Break(void)
 {
 	dbgPrint("Breaking out of REPT/FOR\n");
@@ -510,8 +516,7 @@ bool fstk_Break(void)
 		return false;
 	}
 
-	/* Prevent more iterations */
-	contextStack->nbReptIters = 0;
+	fstk_StopRept();
 	return true;
 }
 
diff --git a/src/asm/parser.y b/src/asm/parser.y
index ccbd9661b9..8d38b76c06 100644
--- a/src/asm/parser.y
+++ b/src/asm/parser.y
@@ -576,6 +576,9 @@ line		: label T_NEWLINE
 		| label directive T_NEWLINE
 		| assignment_directive T_NEWLINE
 		| line_directive /* Directives that manage newlines themselves */
+		| error T_NEWLINE { /* Continue parsing the next line on a syntax error */
+			fstk_StopRept();
+		}
 ;
 
 /*
diff --git a/test/asm/error-recovery.asm b/test/asm/error-recovery.asm
new file mode 100644
index 0000000000..3136bc5194
--- /dev/null
+++ b/test/asm/error-recovery.asm
@@ -0,0 +1,11 @@
+	println "begin"
+
+	println 42, 1 2 3 4
+
+for n, 5
+	println "start {d:n}"
+	println syntax error
+	println "finish {d:n}"
+endr
+
+	println "end {d:n}"
diff --git a/test/asm/error-recovery.err b/test/asm/error-recovery.err
new file mode 100644
index 0000000000..f3c64cd679
--- /dev/null
+++ b/test/asm/error-recovery.err
@@ -0,0 +1,5 @@
+ERROR: error-recovery.asm(3):
+    syntax error, unexpected number
+ERROR: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
+    syntax error, unexpected identifier
+error: Assembly aborted (2 errors)!
diff --git a/test/asm/error-recovery.out b/test/asm/error-recovery.out
new file mode 100644
index 0000000000..c8f0b99aa3
--- /dev/null
+++ b/test/asm/error-recovery.out
@@ -0,0 +1,4 @@
+begin
+$2Astart 0
+finish 0
+end 0
diff --git a/test/asm/error-recovery.simple.err b/test/asm/error-recovery.simple.err
new file mode 100644
index 0000000000..b9582e68c6
--- /dev/null
+++ b/test/asm/error-recovery.simple.err
@@ -0,0 +1,5 @@
+ERROR: error-recovery.asm(3):
+    syntax error
+ERROR: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
+    syntax error
+error: Assembly aborted (2 errors)!
diff --git a/test/asm/label-macro-arg.err b/test/asm/label-macro-arg.err
index 084316dd2b..240e86516e 100644
--- a/test/asm/label-macro-arg.err
+++ b/test/asm/label-macro-arg.err
@@ -1,4 +1,19 @@
 ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
     syntax error, unexpected =
 while expanding symbol "VAR_DEF"
-error: Assembly aborted (1 errors)!
+ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
+    Interpolated symbol "sizeof_.something" does not exist
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+    Label "sizeof_" created outside of a SECTION
+while expanding symbol "VAR_DEF"
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+    Macro "something" not defined
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+    'sizeof_' already defined at label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25)
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+    Macro "something" not defined
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+    Invalid format spec 'sizeof_'
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+    Interpolated symbol "something" does not exist
+error: Assembly aborted (8 errors)!
diff --git a/test/asm/label-macro-arg.out b/test/asm/label-macro-arg.out
index 26e33473ec..106412e246 100644
--- a/test/asm/label-macro-arg.out
+++ b/test/asm/label-macro-arg.out
@@ -5,3 +5,5 @@ $8
 sizeof__something equals $1
 sizeof_@something equals $1
 sizeof_#something equals $1
+sizeof_.something equals 
+sizeof_:something equals 
diff --git a/test/asm/label-macro-arg.simple.err b/test/asm/label-macro-arg.simple.err
index d8e938379f..ba199e9315 100644
--- a/test/asm/label-macro-arg.simple.err
+++ b/test/asm/label-macro-arg.simple.err
@@ -4,4 +4,21 @@ while expanding symbol "VAR_DEF"
 ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
     syntax error
 while expanding symbol "VAR_DEF"
-error: Assembly aborted (2 errors)!
+ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26):
+    Local label 'sizeof_.something' in main scope
+ERROR: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
+    Interpolated symbol "sizeof_.something" does not exist
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+    Label "sizeof_" created outside of a SECTION
+while expanding symbol "VAR_DEF"
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
+    Macro "something" not defined
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+    'sizeof_' already defined at label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25)
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
+    Macro "something" not defined
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+    Invalid format spec 'sizeof_'
+ERROR: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
+    Interpolated symbol "something" does not exist
+error: Assembly aborted (10 errors)!