ChatHandler bugfixes

Fixes Issue #132 and Issue #135