Return a more robust response.
Switch client to be a service in its own right.