#JC-1251 UK messages fix and NoNull validation message fix