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.