diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
index 54e9858..e8798cf 100644
--- a/src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
+++ b/src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
@@ -53,7 +53,7 @@ public class PlayerInteract implements Listener {
         Action action = event.getAction();
         Player player = event.getPlayer();
 
-        if (isChest(block) && Properties.USE_BUILT_IN_PROTECTION) {
+        if (Properties.USE_BUILT_IN_PROTECTION && isChest(block)) {
             if (Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) {
                 return;
             }
diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EmptyShopDeleter.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EmptyShopDeleter.java
index d1e1296..60f4a96 100644
--- a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EmptyShopDeleter.java
+++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EmptyShopDeleter.java
@@ -25,12 +25,12 @@ public class EmptyShopDeleter implements Listener {
         }
 
         Inventory ownerInventory = event.getOwnerInventory();
-        Sign sign = event.getSign();
 
         if (!shopShouldBeRemoved(ownerInventory, event.getStock())) {
             return;
         }
 
+        Sign sign = event.getSign();
         sign.getBlock().setType(Material.AIR);
 
         if (Properties.REMOVE_EMPTY_CHESTS && !ChestShopSign.isAdminShop(ownerInventory) && InventoryUtil.isEmpty(ownerInventory)) {