Tidy up commands, and make them output when things go boom

src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java

@@ -68,8 +68,9 @@ public class UUIDVaultManager {
         if (size % 9 != 0) {
             size = 54;
         }
+
         VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
-        Inventory inv = null;
+        Inventory inv;
         if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
             inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
         } else {
@@ -92,6 +93,7 @@ public class UUIDVaultManager {
             }
             PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
         }
+
         return inv;
     }
 
@@ -172,8 +174,7 @@ public class UUIDVaultManager {
     }
 
     public boolean vaultExists(UUID holder, int number) {
-        YamlConfiguration playerFile = getPlayerVaultFile(holder);
-        return playerFile.contains("vault" + number);
+        return getPlayerVaultFile(holder).contains("vault" + number);
     }
 
     /**
@@ -191,17 +192,21 @@ public class UUIDVaultManager {
         if (!file.exists()) {
             return;
         }
+
         FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
         if (file.exists()) {
             playerFile.set("vault" + number, null);
             playerFile.save(file);
         }
+
         OfflinePlayer player = Bukkit.getPlayer(holder);
         if (player != null && sender.getName().equalsIgnoreCase(player.getName())) {
             sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT.toString().replace("%v", String.valueOf(number)));
         } else {
             sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT.toString().replace("%v", String.valueOf(number)).replaceAll("%p", player.getName()));
         }
+
+	    PlayerVaults.getInstance().getOpenInventories().remove(new VaultViewInfo(holder.toString(), number).toString());
     }
 
     /**

src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java

@@ -84,6 +84,7 @@ public class VaultOperations {
         } catch (NumberFormatException nfe) {
             return false;
         }
+
         if (checkPerms(player, number)) {
             if (EconomyOperations.payToOpen(player, number)) {
                 Inventory inv = UUIDVaultManager.getInstance().loadOwnVault(player, number, getMaxVaultSize(player));
@@ -147,11 +148,12 @@ public class VaultOperations {
                 number = Integer.parseInt(arg);
                 if (number == 0) {
                     player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
+	                return;
                 }
-                return;
             } catch (NumberFormatException nfe) {
                 player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
             }
+
             try {
                 if (EconomyOperations.refundOnDelete(player, number)) {
                     UUIDVaultManager.getInstance().deleteVault(player, player.getUniqueId(), number);
@@ -184,6 +186,7 @@ public class VaultOperations {
                 } catch (NumberFormatException nfe) {
                     sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
                 }
+
                 try {
                     UUIDVaultManager.getInstance().deleteVault(sender, holder.getUniqueId(), number);
                 } catch (IOException e) {