Fixes handling of empty messages
Merge pull request #144 from ZeissS/fix-empty-messages

Fixes handling of empty messages