Prevent NPEs when working with server-side messages
Update build
Merge pull request #45 from madhead/master

Prevent NPEs when working with server-side messages