diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index cd2dcd57ae..b653dfea91 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -196,7 +196,7 @@ public class Vars implements Loadable{
 
         Version.init();
 
-        if(files ==null) tree = new FileTree();
+        if(tree == null) tree = new FileTree();
         if(mods == null) mods = new Mods();
 
         content = new ContentLoader();
@@ -254,16 +254,12 @@ public class Vars implements Loadable{
         maps.load();
     }
 
-    public static void createDirectories(){
+    public static void loadSettings(){
         Core.settings.setAppName(appName);
 
-        if(steam || Version.modifier.equals("steam")){
+        if(steam || "steam".equals(Version.modifier)){
             Core.settings.setDataDirectory(Core.files.local("saves/"));
         }
-    }
-
-    public static void loadSettings(){
-        createDirectories();
 
         Core.settings.defaults("locale", "default");
         Core.keybinds.setDefaults(Binding.values());
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index a632849dcc..23f5f876b0 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -45,6 +45,7 @@ public class ApplicationTests{
                 public void setup(){
                     headless = true;
                     net = new Net(null);
+                    tree = new FileTree();
                     Vars.init();
                     content.createContent();