Just in case
Do not set null message
Merge pull request #202 from piotras/ratatoskr

Minor updates