diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 136c7d443b9..29307c98ded 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2551,7 +2551,12 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
           getLoadedCoprocessors());
     }
     if (t != null) LOG.fatal(msg, t);
-    stop(msg);
+
+    try {
+      stopMaster();
+    } catch (IOException e) {
+      LOG.error("Exception occurred while stopping master", e);
+    }
   }
 
   @Override