diff --git a/Bukkit/src/main/java/net/tnemc/item/bukkit/data/BukkitPotionData.java b/Bukkit/src/main/java/net/tnemc/item/bukkit/data/BukkitPotionData.java
index 8c95307..a31e811 100644
--- a/Bukkit/src/main/java/net/tnemc/item/bukkit/data/BukkitPotionData.java
+++ b/Bukkit/src/main/java/net/tnemc/item/bukkit/data/BukkitPotionData.java
@@ -44,9 +44,10 @@ public class BukkitPotionData extends SerialPotionData<ItemStack> {
   public void of(ItemStack stack) {
 
     final PotionMeta meta = (PotionMeta)stack.getItemMeta();
-    if(meta != null) {
+    if(meta != null && meta.getBasePotionData() != null) {
 
       if(meta.hasColor()) colorRGB = meta.getColor().asRGB();
+
       type = meta.getBasePotionData().getType().name();
       extended = meta.getBasePotionData().isExtended();
       upgraded = meta.getBasePotionData().isUpgraded();