Clarified error cases and simplified the Client class