Catch invalid messages
Merge pull request #16 from ManiacTwister/patch-3

Catch invalid messages