diff --git a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
index ab03b904eb..82b7bd7a3d 100644
--- a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
+++ b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
@@ -310,7 +310,7 @@ public class CoreModManager {
             else
                 ret = ObjectArrays.concat(ret, dir.listFiles(filter), File.class);
         }
-        return ret;
+        return ret == null ? new File[0] : ret;
     }
     private static File[] listFiles(FileFilter filter, File ... dirs)
     {
@@ -324,7 +324,7 @@ public class CoreModManager {
             else
                 ret = ObjectArrays.concat(ret, dir.listFiles(filter), File.class);
         }
-        return ret;
+        return ret == null ? new File[0] : ret;
     }
 
     private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader)