Index: hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (revision 1537336) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (working copy) @@ -1888,7 +1888,8 @@ @Override public boolean processRow(Result rowResult) throws IOException { - if(!MetaScanner.getHRegionInfo(rowResult).getTable().isSystemTable()) { + HRegionInfo hri = MetaScanner.getHRegionInfo(rowResult); + if (hri != null && hri.getTable() != null && !hri.getTable().isSystemTable()) { Delete delete = new Delete(rowResult.getRow()); delete.deleteColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER); deletes.add(delete);