Index: src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java (revision 1198621) +++ src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java (working copy) @@ -254,13 +254,19 @@ private static FileStatus getTableInfoPath(final FileSystem fs, final Path tabledir) throws IOException { - FileStatus [] status = fs.listStatus(tabledir, new PathFilter() { - @Override - public boolean accept(Path p) { - // Accept any file that starts with TABLEINFO_NAME - return p.getName().startsWith(TABLEINFO_NAME); - } - }); + FileStatus [] status = null; + try { + status = fs.listStatus(tabledir, new PathFilter() { + @Override + public boolean accept(Path p) { + // Accept any file that starts with TABLEINFO_NAME + return p.getName().startsWith(TABLEINFO_NAME); + } + }); + } catch (FileNotFoundException fnfe) { + // if tabledir doesn't exist, return null + LOG.info(tabledir + " doesn't exist", fnfe); + } if (status == null || status.length < 1) return null; Arrays.sort(status, new FileStatusFileNameComparator()); if (status.length > 1) {