catch bad message keys
Merge pull request #254 from matiu/bug/messagekey

catch bad message keys