diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
index 2298f02..473bc0e 100644
--- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java
+++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
@@ -102,6 +102,7 @@ public class PlayerVaults extends JavaPlugin {
 
     @Override
     public void onDisable() {
+
         for (Player player : Bukkit.getOnlinePlayers()) {
             if (this.inVault.containsKey(player.getName())) {
                 Inventory inventory = player.getOpenInventory().getTopInventory();
diff --git a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
index b3753b8..530b147 100644
--- a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
@@ -46,8 +46,6 @@ public class VaultCommand implements CommandExecutor {
 
                             sender.sendMessage(Lang.TITLE.toString() + Lang.EXISTING_VAULTS.toString().replaceAll("%p", args[0]).replaceAll("%v", sb.toString().trim()));
                         }
-                    } else {
-                        sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER.toString());
                     }
                     break;
                 case 2:
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
index b8a49fa..b28c2c8 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
@@ -82,6 +82,7 @@ public class VaultOperations {
                 return false;
             }
         } catch (NumberFormatException nfe) {
+            player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER.toString());
             return false;
         }