Merge "Handle rest client 500 response if non-json body"