Merge pull request #632 from zanata/smtp-include-exception