CRM-16417 improve error presentation