fixed a timeout after invalid UTF-8 inputs from IRC.
Merge branch 'master' into name-change