Added server side validation handling