diff --git a/src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/UpgradeTools.java b/src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/UpgradeTools.java
index 16d63dd..fe1858b 100644
--- a/src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/UpgradeTools.java
+++ b/src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/UpgradeTools.java
@@ -83,7 +83,7 @@ public static List<Upgrade> getUpgrades(ItemStack tool) {
     public static CompoundTag setUpgradesNBT(List<Upgrade> laserUpgrades) {
         CompoundTag listCompound = new CompoundTag();
         ListTag list = new ListTag();
-        if (laserUpgrades.isEmpty()) return listCompound;
+        if (laserUpgrades == null || laserUpgrades.isEmpty()) return listCompound;
 
         laserUpgrades.forEach( upgrade -> {
             CompoundTag compound = new CompoundTag();