null message listener
Merge pull request #1270 from jay-hodgson/release-64

null message listener