Revert "Catch a common exception in client socket "

I would like to make a pull request instead of this commit.
This reverts commit d6620fb58a576aa9dddb84314fc420f720f7faa4.