diff --git a/ServerExt/Classes/Ext_TraitSupply.uc b/ServerExt/Classes/Ext_TraitSupply.uc
index 796dbab..49e00b9 100644
--- a/ServerExt/Classes/Ext_TraitSupply.uc
+++ b/ServerExt/Classes/Ext_TraitSupply.uc
@@ -4,17 +4,17 @@ var() Texture2D SupplyIcon;
 
 static function ApplyEffectOn(KFPawn_Human Player, Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
 {
-	Ext_TraitSupplyData(Data).SpawnSupplier(Player);
+	if (Data != None) Ext_TraitSupplyData(Data).SpawnSupplier(Player);
 }
 
 static function CancelEffectOn(KFPawn_Human Player, Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
 {
-	Ext_TraitSupplyData(Data).RemoveSupplier();
+	if (Data != None) Ext_TraitSupplyData(Data).RemoveSupplier();
 }
 
 static function PlayerDied(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
 {
-	Ext_TraitSupplyData(Data).RemoveSupplier();
+	if (Data != None) Ext_TraitSupplyData(Data).RemoveSupplier();
 }
 
 defaultproperties