diff --git a/src/asm/fstack.c b/src/asm/fstack.c
index a464f436..51caf249 100644
--- a/src/asm/fstack.c
+++ b/src/asm/fstack.c
@@ -204,7 +204,10 @@ void fstk_RunInclude(char const *path)
 
 	if (!fstk_FindFile(path, &fullPath, &size)) {
 		free(fullPath);
-		error("Unable to open included file '%s': %s\n", path, strerror(errno));
+		if (oGeneratedMissingIncludes)
+			oFailedOnMissingInclude = true;
+		else
+			error("Unable to open included file '%s': %s\n", path, strerror(errno));
 		return;
 	}
 	dbgPrint("Full path: \"%s\"\n", fullPath);
diff --git a/src/asm/symbol.c b/src/asm/symbol.c
index f1f622dd..8bf37b97 100644
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -78,7 +78,7 @@ void sym_ForEach(void (*func)(struct Symbol *, void *), void *arg)
 static int32_t Callback_NARG(void)
 {
 	if (!macro_GetCurrentArgs()) {
-		yyerror("_NARG does not make sense outside of a macro");
+		error("_NARG does not make sense outside of a macro\n");
 		return 0;
 	}
 	return macro_NbArgs();