OS-6 Adds additional check to prevent 500 errors from causing the
response body to be read