Better parsing error handling