diff --git a/main/lib/eval/eval_analyze.c b/main/lib/eval/eval_analyze.c
index 31a6b9113..80770fea7 100644
--- a/main/lib/eval/eval_analyze.c
+++ b/main/lib/eval/eval_analyze.c
@@ -529,7 +529,7 @@ PUBLIC void EVAL_analyze(const char *src, int len, int state, EVAL_ANALYZE *resu
 		EVAL_clear(EVAL, FALSE);
 		
 		EVAL->source = GB.NewString(src, len);
-		EVAL->source = GB.AddString(EVAL->source, "\0\0", 2);
+		EVAL->source = GB.AddString(EVAL->source, "\n\0\0", 3);
 		EVAL->len = len;
 		
 		EVAL->analyze = TRUE;
diff --git a/main/lib/eval/eval_read.c b/main/lib/eval/eval_read.c
index bd8c3ad8e..d97a2ebbd 100644
--- a/main/lib/eval/eval_read.c
+++ b/main/lib/eval/eval_read.c
@@ -820,7 +820,7 @@ static void add_quoted_identifier(void)
 	{
 		source_ptr++;
 		car = get_char();
-		if (car == '\n')
+		if (!car || car == '\n')
 			break;
 		len++;
 		if (car == '}')