CLOUD-89 fixed validations and externalized error messages