diff --git a/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java b/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
index 15d5d41..d30b5f7 100644
--- a/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
+++ b/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
@@ -28,10 +28,12 @@ public abstract class JedisClusterConnectionHandler {
 		    hostAndPort.getPort());
 	    this.nodes.put(hostAndPort.getHost() + hostAndPort.getPort(), jp);
 	    Jedis jedis = jp.getResource();
-	    discoverClusterNodesAndSlots(jedis);
-	    jp.returnResource(jedis);
+	    try {
+		discoverClusterNodesAndSlots(jedis);
+	    } finally {
+		jp.returnResource(jedis);
+	    }
 	}
-
     }
 
     private void discoverClusterNodesAndSlots(Jedis jedis) {