diff --git a/jar/FreedyMinigameMaker2.jar b/jar/FreedyMinigameMaker2.jar
index 1fd58c7..381ed60 100644
Binary files a/jar/FreedyMinigameMaker2.jar and b/jar/FreedyMinigameMaker2.jar differ
diff --git a/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java b/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java
index 143f48d..6976c40 100644
--- a/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java
+++ b/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java
@@ -18,13 +18,16 @@ public final class FMGPlugin extends JavaPlugin {
 
     private static FMGPlugin plugin;
 
+    public FMGPlugin() {
+        plugin = this;
+    }
+
     public static FMGPlugin getInst() {
         return plugin;
     }
 
     @Override
     public void onEnable() {
-        plugin = this;
         new MetricsLite(this, 12184);
         NMS.init();
         FMGCommand.init();
diff --git a/src/main/java/kr/jongwonlee/fmg/util/YamlStore.java b/src/main/java/kr/jongwonlee/fmg/util/YamlStore.java
index 49a0ec6..5f4bd3b 100644
--- a/src/main/java/kr/jongwonlee/fmg/util/YamlStore.java
+++ b/src/main/java/kr/jongwonlee/fmg/util/YamlStore.java
@@ -113,7 +113,7 @@ public void setLocation(String path, Location location) {
 
     public Location getLocation(String path) {
         final World world = Bukkit.getWorld(getString(path + ".WORLD"));
-        if (world == null) return null;
+        //if (world == null) return null;
         final double x = getDouble(path + ".X");
         final double y = getDouble(path + ".Y");
         final double z = getDouble(path + ".Z");