fixing obnoxious oversight casued by last error handler change (log was spitting out all the unsightly TCP CONNECTION CLOSED!!!1 errors. ugh.
Merge branch 'master' into local
Merge remote-tracking branch 'origin/local' into local