Add Exception check when remove a client