diff --git a/pom.xml b/pom.xml
index 2e13386..852c2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.modnmetl</groupId>
     <artifactId>virtualrealty</artifactId>
-    <version>2.8.1</version>
+    <version>2.8.2</version>
     <packaging>jar</packaging>
 
     <description>A plot creation and management plugin for Minecraft</description>
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
index a24ea09..046c4f7 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
@@ -337,7 +337,7 @@ public void onPlotItemDraft(PlayerInteractEvent e) {
         }
         PlayerInventory inv = player.getInventory();
         ItemStack claimItem = VirtualRealty.legacyVersion ? player.getItemInHand() : inv.getItemInMainHand();
-
+        if (claimItem == null || claimItem.getType() == Material.AIR) return;
         String item = NBT.get(claimItem, nbt -> {
             return nbt.getString("vrplot_item");
         });
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
index 81cece6..ba2189b 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
@@ -73,6 +73,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     public void onBlockPlace(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         ItemStack itemInHand = VirtualRealty.legacyVersion ? player.getItemInHand() : player.getInventory().getItemInMainHand();
+        if (itemInHand == null || itemInHand.getType() == Material.AIR) return;
         boolean hasItemKey = NBT.get(itemInHand, nbt -> {
             return nbt.hasTag("vrplot_item");
         });