Handle socket exceptions more carefully
Merge branch 'hotfix/better_socket_exception'