* Make sure we bail out if field validation failed when importing modules * Tweak form validation logic Co-authored-by: jeremystretch <jstretch@ns1.com>