diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
index 9ac84989..b3fbcba8 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
@@ -84,7 +84,9 @@ public class SimulatorStorage implements Enable {
         SimulatorFormatSimulatorLoader simulatorFormatSimulatorLoader = new SimulatorFormatSimulatorLoader();
         YAPIONFormatSimulatorLoader yapionFormatSimulatorLoader = new YAPIONFormatSimulatorLoader();
 
-        for (File file : simulatorsDir.listFiles()) {
+        File[] files = simulatorsDir.listFiles();
+        if (files == null) return;
+        for (File file : files) {
             try {
                 List<Simulator> simulators = simFormatSimulatorLoader.load(file)
                         .orElse(null);