Client side error handling, server side validation fixes