Merge pull request #9494 from mbauskar/patch-fixes

[fix] handle email exception if email account is not configured