Index: hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java (revision 1567739) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java (working copy) @@ -98,7 +98,9 @@ if (tableDir == null || regionDir == null) { LOG.error("No archive directory could be found because tabledir (" + tableDir + ") or regiondir (" + regionDir + "was null. Deleting files instead."); - deleteRegionWithoutArchiving(fs, regionDir); + if (regionDir != null) { + deleteRegionWithoutArchiving(fs, regionDir); + } // we should have archived, but failed to. Doesn't matter if we deleted // the archived files correctly or not. return false;