refs #33555
Merge pull request #534 from aipocom/bugfix/webmail-NullPointerException

refs #33555