diff --git a/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java b/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java
index <HASH>..<HASH> 100644
--- a/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java
+++ b/h2o-persist-hdfs/src/main/java/water/persist/PersistHdfs.java
@@ -295,10 +295,9 @@ public final class PersistHdfs extends Persist {
   }
 
   private static void addFolder(FileSystem fs, Path p, ArrayList<String> keys, ArrayList<String> failed) {
+    if (fs == null) return;
+    Futures futures = new Futures();
     try {
-      if( fs == null ) return;
-
-      Futures futures = new Futures();
       for( FileStatus file : fs.listStatus(p, HIDDEN_FILE_FILTER) ) {
         Path pfs = file.getPath();
         if(file.isDirectory()) {
@@ -312,6 +311,8 @@ public final class PersistHdfs extends Persist {
     } catch( Exception e ) {
       Log.err(e);
       failed.add(p.toString());
+    } finally {
+      futures.blockForPending();
     }
   }
PUBDEV-<I>: Fix a race condition in Hdfs file import