CORE-4537 Improved error message