Be more cautious about the response ID returned from ES
Merge branch 'error-check'