Fixed validation messages

This part of #479