Email notifications - reworked exception handling