Fixed parsing error handling