Update exception handling for mail