Improve error message of "server closed connection"

Build 4044
Receiving this error message when trying to run a query:
cbq> select count from `travel-sample` where a=1;
{
"requestID": "68fe841d-db2a-400f-aeb5-0e51d55fa45c",
"signature":

{ "$1": "number" }

,
"results": [

{ "$1": 0 }

],
"errors": [

{ "code": 5000, "msg": "server closed connection (EOF) - cause: server closed connection (EOF)" }

],
"status": "errors",
"metrics":

{ "elapsedTime": "37.538149ms", "executionTime": "37.473495ms", "resultCount": 1, "resultSize": 31, "errorCount": 1 }

}

It would be very helpful if this message was a bit clearer:
-which IP/hostname closed the connection
-Was this when trying to connect to the indexer or to the data service
-What was the query engine trying to do at this point?