Add better exception handling for emails