TRUNK-4322: Fixed ugly error message