Refinements in client model for error handling.