diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
index 172c170b920..0d410fc9166 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
@@ -297,10 +297,10 @@ public class JVMClusterUtil {
         for (RegionServerThread t : regionservers) {
           if (t.isAlive()) {
             LOG.warn("RegionServerThreads taking too long to stop, interrupting; thread dump "  +
-              "if > three attempts");
+              "if > three attempts: i=" + i);
             if (i > 3) {
               try {
-                Threads.threadDumpingIsAlive(t.getRegionServer().getThread());
+                Threads.threadDumpingIsAlive(t);
               } catch (InterruptedException e) {
                 e.printStackTrace();
               }