Changes to parser error handling