EUCA-7281
Add more validation rules and messages.