Add some error handling to the parser