REST level exception handling cleanup