pythonthings
diff --git a/‎pymongo/connection.py‎
Lines changed: 4 additions & 5 deletions b/‎pymongo/connection.py‎
Lines changed: 4 additions & 5 deletions
@@ -741,7 +741,7 @@ def _send_message(self, message, with_last_error=False):
                                                             sock_info)
                 rv = self.__check_response_to_last_error(response)
 
-            self.__pool.return_socket(sock_info)
+            self.__pool.maybe_return_socket(sock_info)
             return rv
         except (ConnectionFailure, socket.error), e:
             self.disconnect()
@@ -758,8 +758,7 @@ def __receive_data_on_socket(self, length, sock_info):
             try:
                 chunk = sock_info.sock.recv(length)
             except:
-                # If recv was interrupted, discard the socket
-                # and re-raise the exception.
+                # recv was interrupted
                 self.__pool.discard_socket(sock_info)
                 raise
             if chunk == EMPTY:
@@ -816,12 +815,12 @@ def _send_message_with_response(self, message,
                     # Restore the socket's original timeout and return it to
                     # the pool
                     sock_info.sock.settimeout(self.__net_timeout)
-                    self.__pool.return_socket(sock_info)
+                    self.__pool.maybe_return_socket(sock_info)
                 except socket.error:
                     # There was an exception and we've closed the socket
                     pass
             else:
-                self.__pool.return_socket(sock_info)
+                self.__pool.maybe_return_socket(sock_info)
 
     def start_request(self):
         """Ensure the current thread or greenlet always uses the same socket