CM-16758: handle 500 response