improve error message, Zendesk #1400