Yeah, I guess that would be better. Unfortunately the Prometheus web API currently doesn't get the information about whether an error from the query layer was a client error or a server error (queries can fail for both reasons, and the web API only sees a Go "error"). Anyways, this is something that would need to be changed separately and out of scope for this PR.