Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1324909) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -898,7 +898,7 @@ } public boolean isMasterRunning() { - return !isStopped(); + return !isStopped() && isInitialized(); } /**