diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
index 8f7f568411e..7fc3ad58507 100644
--- a/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
+++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
@@ -133,9 +133,10 @@ public class HStoreFileToStoreFile extends Configured implements Tool {
           // look in the 'mapfile' subdir.
           Path mfsdir = new Path(family, "mapfiles");
           FileStatus [] familyStatus = fs.listStatus(mfsdir);
-          if (familyStatus.length > 1) {
-            LOG.warn(family.toString() + " has " + familyStatus.length +
-            " files.  Continuing...");
+          if (familyStatus == null || familyStatus.length > 1) {
+            LOG.warn(family.toString() + " has " +
+              ((familyStatus == null) ? "null": familyStatus.length) +
+              " files.  Continuing...");
             continue;
           }
           if (familyStatus.length == 1) {