Fixed tokenizer error handling error.
Source location refactoring