V2 fixed error locations

Fixes the parser error handling.