Do not set null message
Merge pull request #203 from piotras/master

Do not set null message