Improve client exceptions