Nicer output on error
Fixed storing incorrect names in lexer