diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
index d88d957..b5122fa 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
@@ -276,14 +276,16 @@ public class UUIDVaultManager {
         }
 
         File file = new File(this.directory, uniqueId.toString() + ".yml");
-        if (!file.exists() && createIfNotFound) {
-            try {
-                file.createNewFile();
-            } catch (IOException e) {
-                // Who cares?
+        if (!file.exists()) {
+            if (createIfNotFound) {
+                try {
+                    file.createNewFile();
+                } catch (IOException e) {
+                    // Who cares?
+                }
+            } else {
+                return null;
             }
-        } else {
-            return null;
         }
 
         return YamlConfiguration.loadConfiguration(file);