diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc
index 8c0ab7d4..d7268385 100644
--- a/server/gameserver/buff.cc
+++ b/server/gameserver/buff.cc
@@ -54,7 +54,7 @@ void Buff::InternalTimerAddBuff(Creature* caster)
                 int buff_id = param.param2;
                 MetaData::Skill* skill = (MetaData::Skill*)param.param3.GetUserData();
                 MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
-                {
+                if (buff_meta) {
                     SkillCasterState old_caster_state;
                     caster_state->caster.Get()->FillSkillCasterState(&old_caster_state);
                     caster_state->caster.Get()->RecoverSkillCasterState(caster_state);
@@ -74,7 +74,7 @@ void Buff::InternalTimerAddBuff(Creature* caster)
     caster->FillSkillCasterState(caster_state);
 
     a8::XParams param;
-    param.SetSender(this);
+    param.SetSender(owner);
     param.SetParam1(caster_state);
     param.SetParam2(meta->i->buff_param2());
     param.SetParam3(caster->CurrentSkill()  ? caster->CurrentSkill()->meta : nullptr);