Log Exception occuring when sending e-mail alerts (notifications).
Merge branch 'upstreamFixes'