Add form errors, and merge form handler