diff --git a/common/src/main/java/com/stardust/pio/PFiles.java b/common/src/main/java/com/stardust/pio/PFiles.java
index 9ad1a4d0..2ca2f4f0 100644
--- a/common/src/main/java/com/stardust/pio/PFiles.java
+++ b/common/src/main/java/com/stardust/pio/PFiles.java
@@ -412,17 +412,23 @@ public class PFiles {
 
     public static String[] listDir(String path) {
         File file = new File(path);
-        return file.list();
+        return wrapNonNull(file.list());
+    }
+
+    private static String[] wrapNonNull(String[] list) {
+        if (list == null)
+            return new String[0];
+        return list;
     }
 
     public static String[] listDir(String path, final Func1<String, Boolean> filter) {
         final File file = new File(path);
-        return file.list(new FilenameFilter() {
+        return wrapNonNull(file.list(new FilenameFilter() {
             @Override
             public boolean accept(File dir, String name) {
                 return filter.call(name);
             }
-        });
+        }));
     }
 
     public static boolean isFile(String path) {