Exception handling added to client.