Fixed client exceptions