diff --git a/src/client/connector.rs b/src/client/connector.rs
index 66c21e890..f5ac70aee 100644
--- a/src/client/connector.rs
+++ b/src/client/connector.rs
@@ -92,7 +92,10 @@ pub enum ClientConnectorError {
 
 impl From<ConnectorError> for ClientConnectorError {
     fn from(err: ConnectorError) -> ClientConnectorError {
-        ClientConnectorError::Connector(err)
+        match err {
+            ConnectorError::Timeout => ClientConnectorError::Timeout,
+            _ => ClientConnectorError::Connector(err)
+        }
     }
 }