Expands the scope of error detection
Expands the scope of error detection

Now covers the entire e-mail object set-up process, so if any part
throws we'll catch it nicely.

hsed/eesoc-website,EESoc/eesoc-website,EESoc/eesoc-website,hsed/eesoc-website,hsed/eesoc-website,EESoc/eesoc-website