fix 500 when there are form validation errors
Merge branch 'cm-vellum' into staging