Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1501610) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -2147,7 +2147,7 @@ * @return true if we should proceed with abort operation, false other wise. */ private boolean abortNow(final String msg, final Throwable t) { - if (!this.isActiveMaster) { + if (!this.isActiveMaster || this.stopped) { return true; } if (t != null && t instanceof KeeperException.SessionExpiredException) {