fix uncaught tcp err
Merge pull request #22 from hubiquitus/bug/uncaught_tcp_err

uncaught tcp err fix
Merge branch 'master' into refactor/cleanup