Merge "Handle error in test_create_get_delete_service"