diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index a3868b543..dd807f454 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -79,6 +79,10 @@ public class PlayerListener implements Listener {
 
         if (playerProfile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) || playerProfile.getAbilityMode(AbilityType.SUPER_BREAKER)) {
             for (ItemStack item : event.getDrops()) {
+                if (item == null || item.getType() == Material.AIR ) {
+                    continue;
+                }
+
                 if (item.containsEnchantment(Enchantment.DIG_SPEED)) {
                     ItemMeta itemMeta = item.getItemMeta();
 
diff --git a/src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java b/src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java
index ce5ec06ad..b0a3a4079 100644
--- a/src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java
+++ b/src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java
@@ -3,6 +3,7 @@ package com.gmail.nossr50.skills.utilities;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -545,6 +546,10 @@ public class SkillTools {
         PlayerInventory playerInventory = player.getInventory();
 
         for (ItemStack item : playerInventory.getContents()) {
+            if (item == null || item.getType() == Material.AIR ) {
+                continue;
+            }
+
             if (item.containsEnchantment(Enchantment.DIG_SPEED)) {
                 ItemMeta itemMeta = item.getItemMeta();