Fix private messages crashing the bot.
Merge branch 'master' into personal