diff --git a/Lexing.jai b/Lexing.jai
index ab77cf9..7b6a310 100644
--- a/Lexing.jai
+++ b/Lexing.jai
@@ -509,12 +509,14 @@ lex :: (result : *Compile_Result) {
 	for *file : result.files {
 		lexer : Lexer;
 		init_lexer_from_string(*lexer, file.file.source);
+		lexer.path = file.file.path;
 		token : *Token = scan_next_token(*lexer);
 		while token && token.kind != .TOKEN_EOF {
 			token = scan_next_token(*lexer);
 		}
 
 		array_copy(*file.tokens.tokens, lexer.result.tokens);
+		result.had_error |= lexer.result.had_error;
 
 		// @Incomplete(nb): Temporary until we figure out a good way of passing this stuff around
 		copy_messages(lexer.result.messages, *result.messages);