CLDIDE-1671 Changes in some error messages