diff --git a/core/src/main/java/me/prettyprint/hector/api/factory/HFactory.java b/core/src/main/java/me/prettyprint/hector/api/factory/HFactory.java
index 79af7ab18..7b17a9bfa 100644
--- a/core/src/main/java/me/prettyprint/hector/api/factory/HFactory.java
+++ b/core/src/main/java/me/prettyprint/hector/api/factory/HFactory.java
@@ -213,8 +213,8 @@ public static void setClusterForTest(Cluster cluster) {
    * @param cluster
    */
   public static void shutdownCluster(Cluster cluster) {
-    synchronized (clusters) {
       String clusterName = cluster.getName();
+      synchronized (clusters) {
       if (clusters.get(clusterName) != null ) {
         cluster.getConnectionManager().shutdown();
         clusters.remove(clusterName);