EZP-20850: improved exception messages