Improve protocol exceptions