other getMessage calls
Merge pull request #225 from fefe982/dev-fix-223

Check null in other getMessage calls