Added some additional validation messages.