Fixed mail handler throwing and give a way to see errors
Merge pull request #1020 from remy/feature/test-errors

Fixed mail handler throwing and give a way to see errors