diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
index 410df02..77e6db9 100644
--- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java
@@ -52,7 +52,7 @@ public class Listeners implements Listener {
     public void saveVault(Player player, Inventory inventory) {
         if (plugin.getInVault().containsKey(player.getUniqueId().toString())) {
 
-            Inventory inv = Bukkit.createInventory(null, 6 * 9);
+            Inventory inv = Bukkit.createInventory(null, inventory.getSize());
             inv.setContents(inventory.getContents().clone());
 
             PlayerVaults.debug(inventory.getType() + " " + inventory.getClass().getSimpleName());
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
index 6428a78..aba92bc 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
@@ -172,6 +172,7 @@ public class VaultManager {
         // Happens on change of permission or if people used the broken version.
         // In this case, players will lose items.
         if (deserialized.length > size) {
+            PlayerVaults.debug("Loaded vault for " + ownerName + " and got " + deserialized.length + " items for allowed size of " + size+". Attempting to rescue!");
             for (ItemStack stack : deserialized) {
                 if (stack != null) {
                     inventory.addItem(stack);