Added exception handling for mail servier, per #1142