Index: src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (revision 1586913) +++ src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (working copy) @@ -122,10 +122,11 @@ @After public void after() throws Exception { - for (MasterThread mt : TEST_UTIL.getHBaseCluster().getLiveMasterThreads()) { - mt.getMaster().abort("closing...", new Exception("Trace info")); + if (TEST_UTIL.getHBaseCluster() != null) { + for (MasterThread mt : TEST_UTIL.getHBaseCluster().getLiveMasterThreads()) { + mt.getMaster().abort("closing...", new Exception("Trace info")); + } } - TEST_UTIL.shutdownMiniCluster(); }