Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1588521) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -932,7 +932,7 @@ * @see #startMiniCluster() */ public MiniHBaseCluster getMiniHBaseCluster() { - if (this.hbaseCluster instanceof MiniHBaseCluster) { + if (this.hbaseCluster == null || this.hbaseCluster instanceof MiniHBaseCluster) { return (MiniHBaseCluster)this.hbaseCluster; } throw new RuntimeException(hbaseCluster + " not an instance of " +