diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
index 9d80c62..940716d 100644
--- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java
+++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
@@ -16,7 +16,12 @@
  */
 package com.drtshock.playervaults;
 
-import com.drtshock.playervaults.commands.*;
+import com.drtshock.playervaults.commands.ConvertCommand;
+import com.drtshock.playervaults.commands.DeleteCommand;
+import com.drtshock.playervaults.commands.SignCommand;
+import com.drtshock.playervaults.commands.SignSetInfo;
+import com.drtshock.playervaults.commands.VaultCommand;
+import com.drtshock.playervaults.commands.WorkbenchCommand;
 import com.drtshock.playervaults.listeners.Listeners;
 import com.drtshock.playervaults.listeners.SignListener;
 import com.drtshock.playervaults.listeners.VaultPreloadListener;
@@ -39,7 +44,11 @@ import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
index 26bd972..88a2537 100644
--- a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
@@ -13,7 +13,11 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 public class ConvertCommand implements CommandExecutor {
 
diff --git a/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java b/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java
index 3267599..81a7874 100644
--- a/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java
@@ -11,6 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class DeleteCommand implements CommandExecutor {
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (VaultOperations.isLocked()) {
diff --git a/src/main/java/com/drtshock/playervaults/commands/SignCommand.java b/src/main/java/com/drtshock/playervaults/commands/SignCommand.java
index 1de2f38..3940fdc 100644
--- a/src/main/java/com/drtshock/playervaults/commands/SignCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/SignCommand.java
@@ -8,6 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class SignCommand implements CommandExecutor {
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (sender.hasPermission("playervaults.signs.set")) {
diff --git a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
index c3ccc83..8f27bf6 100644
--- a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
@@ -15,6 +15,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 public class VaultCommand implements CommandExecutor {
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (VaultOperations.isLocked()) {
diff --git a/src/main/java/com/drtshock/playervaults/commands/WorkbenchCommand.java b/src/main/java/com/drtshock/playervaults/commands/WorkbenchCommand.java
index 0e87079..f852be0 100644
--- a/src/main/java/com/drtshock/playervaults/commands/WorkbenchCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/WorkbenchCommand.java
@@ -7,6 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class WorkbenchCommand implements CommandExecutor {
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (sender.hasPermission("playervaults.workbench")) {
diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
index 68c0a2c..6eeb403 100644
--- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
@@ -19,22 +19,21 @@ package com.drtshock.playervaults.listeners;
 import com.drtshock.playervaults.PlayerVaults;
 import com.drtshock.playervaults.util.Lang;
 import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager;
-import com.drtshock.playervaults.vaultmanagement.VaultOperations;
 import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
-import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.block.Sign;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.Inventory;
 
 import java.io.IOException;
diff --git a/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java b/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java
index 5d670de..927bc29 100644
--- a/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java
+++ b/src/main/java/com/drtshock/playervaults/listeners/VaultPreloadListener.java
@@ -12,6 +12,7 @@ import org.bukkit.scheduler.BukkitRunnable;
 import java.util.UUID;
 
 public class VaultPreloadListener implements Listener {
+
     final UUIDVaultManager vm = UUIDVaultManager.getInstance();
 
     @EventHandler(priority = EventPriority.MONITOR)
diff --git a/src/main/java/com/drtshock/playervaults/util/Updater.java b/src/main/java/com/drtshock/playervaults/util/Updater.java
index 2adc870..9bc7277 100644
--- a/src/main/java/com/drtshock/playervaults/util/Updater.java
+++ b/src/main/java/com/drtshock/playervaults/util/Updater.java
@@ -6,7 +6,13 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java
index 1c1e6de..a327f56 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java
@@ -30,6 +30,7 @@ import java.io.File;
  * A class that handles all economy operations.
  */
 public class EconomyOperations {
+
     private static final PlayerVaults PLUGIN = PlayerVaults.getInstance();
     private static final FileConfiguration BUKKIT_CONFIG = PLUGIN.getConfig();
 
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
index 3db3f2a..792916e 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
@@ -25,7 +25,12 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 /**
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
index 91b5372..d88d957 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
@@ -240,7 +240,10 @@ public class UUIDVaultManager {
 
     // Should only be run asynchronously
     public void cachePlayerVaultFile(UUID holder) {
-        cachedVaultFiles.put(holder, loadPlayerVaultFile(holder));
+        YamlConfiguration config = this.loadPlayerVaultFile(holder, false);
+        if (config != null) {
+            this.cachedVaultFiles.put(holder, config);
+        }
     }
 
     public void removeCachedPlayerVaultFile(UUID holder) {
@@ -264,17 +267,25 @@ public class UUIDVaultManager {
     }
 
     public YamlConfiguration loadPlayerVaultFile(UUID holder) {
-        if (!directory.exists()) {
-            directory.mkdir();
+        return this.loadPlayerVaultFile(holder, true);
+    }
+
+    public YamlConfiguration loadPlayerVaultFile(UUID uniqueId, boolean createIfNotFound) {
+        if (!this.directory.exists()) {
+            this.directory.mkdir();
         }
-        File file = new File(directory, holder.toString() + ".yml");
-        if (!file.exists()) {
+
+        File file = new File(this.directory, uniqueId.toString() + ".yml");
+        if (!file.exists() && createIfNotFound) {
             try {
                 file.createNewFile();
             } catch (IOException e) {
                 // Who cares?
             }
+        } else {
+            return null;
         }
+
         return YamlConfiguration.loadConfiguration(file);
     }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 0f7fa4c..0be25e5 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: PlayerVaults
 main: com.drtshock.playervaults.PlayerVaults
-authors: [drtshock, Koalaaaa]
+authors: [drtshock, kashike]
 version: ${project.version}-b${BUILD_NUMBER}
 website: http://dev.bukkit.org/server-mods/PlayerVaults
 softdepend: [Vault]
@@ -32,4 +32,4 @@ permissions:
     default: op
   playervaults.bypassblockeditems:
     description: Bypass blocked items.
-    default: op
\ No newline at end of file
+    default: op