Fix TypeError due to missing mail config
Merge pull request #1882 from jgillich/fix

Fix TypeError due to missing mail config