diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 8fdd99fa1f..edbe57860c 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -148,7 +148,15 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         {
             if (state.getKey() == ApplicationState.TOKENS)
                 continue;
-            sb.append("  ").append(state.getKey()).append(":").append(state.getValue().value).append("\n");
+            sb.append("  ").append(state.getKey()).append(":").append(state.getValue().version).append(":").append(state.getValue().value).append("\n");
+        }
+        if (endpointState.applicationState.containsKey(ApplicationState.TOKENS))
+        {
+            sb.append("  TOKENS:").append(endpointState.applicationState.get(ApplicationState.TOKENS).version).append(":<hidden>\n");
+        }
+        else
+        {
+            sb.append("  TOKENS: not present");
         }
     }