JC-1516 Changed validation messages.