refs #33645
Merge pull request #578 from aipocom/bugfix/message-findbugs

refs #33645