fix timeout exception catching and remove duplicate file
Merge branch 'master' of https://github.com/shujianbu/newshub