Small changes to parser error handling