A clearer error message and rescue for the mail since its non-vital