Exception handling improvements

This PR
- fixes a bug which stops emails for known exceptions