Refactor code
Merge pull request #1 from k1LoW/exception_mail

Refactor code