Added a new exception for the Client and did some cleanup