Merge "REST level exception handling cleanup"