Update error handling based on review request. Update tests.