CORE-4537 More descriptive error message