diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 996015a..94d1c92 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -304,7 +304,7 @@
             if (zkClient.exists(e.getKey(), true)) zkClient.delete(e.getKey(), 0, true);
           } else {
             if (zkClient.exists(e.getKey(), true)) {
-              log.info("going to update_collection", e.getKey());
+              log.info("going to update_collection {}", e.getKey());
               zkClient.setData(e.getKey(), ZkStateReader.toJSON(e.getValue()), true);
             } else {
               log.info("going to create_collection {}", e.getValue());
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index ae22429..856b8f4 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -843,8 +843,9 @@
               ClusterState clusterState = ClusterState.load(stat.getVersion(), data, Collections.<String>emptySet(),ZkStateReader.this,fullpath);
               // update volatile
 
-              watchedCollectionStates.put(coll, clusterState.getCollectionStates().get(coll));
-              log.info("Updating data for {} ", coll);
+              DocCollection newState = clusterState.getCollectionStates().get(coll);
+              watchedCollectionStates.put(coll, newState);
+              log.info("Updating data for {} to ver {} ", coll , newState.getZnodeVersion());
 
             }
           } catch (KeeperException e) {
