Add validation to messages