Merging Alex's post-fix with Janas's error-handling.

There's also a half-built canned-response tool in there. Pay it no mind.