FR 1683: Do not submit form if there are errors

Change-Id: I674992b1c47c277f466ef5aac1d9a18df29cb85e