diff --git a/core/src/main/java/com/sekwah/advancedportals/core/serializeddata/DataStorage.java b/core/src/main/java/com/sekwah/advancedportals/core/serializeddata/DataStorage.java
index e9f1b306..0f17ddae 100644
--- a/core/src/main/java/com/sekwah/advancedportals/core/serializeddata/DataStorage.java
+++ b/core/src/main/java/com/sekwah/advancedportals/core/serializeddata/DataStorage.java
@@ -78,14 +78,14 @@ public <T> T loadJson(Class<T> dataHolder, String location) {
     public boolean storeJson(Object dataHolder, String location) {
         // Create folders if they don't exist
         File outFile = new File(this.dataFolder, location);
-        if (!outFile.exists()) {
+        if (!outFile.getParentFile().exists()) { // Check if parent folder exists
             if(!outFile.getParentFile().mkdirs()) {
                 infoLogger.warning("Failed to create folder for file: " + location);
             }
         }
         String json = gson.toJson(dataHolder);
         try {
-            FileWriter fileWriter = new FileWriter(new File(this.dataFolder, location));
+            FileWriter fileWriter = new FileWriter(outFile); // Use outFile directly here
             fileWriter.write(json);
             fileWriter.close();
             return true;