Fix null messages
Merge pull request #12 from kosgan10/patch-1

Fix null messages