diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index fcfdd7fb02..901d67b027 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8210,10 +8210,11 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
     // Blade Barrier
     if (auraSpellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && auraSpellInfo->SpellIconID == 85)
     {
-        if (this->GetTypeId() != TYPEID_PLAYER)
+        Player * plr = this->ToPlayer();
+        if (this->GetTypeId() != TYPEID_PLAYER || !plr || plr->getClass() != CLASS_DEATH_KNIGHT)
             return false;
 
-        if(!this->ToPlayer()->IsBaseRuneSlotsOnCooldown(RUNE_BLOOD))
+        if(!plr->IsBaseRuneSlotsOnCooldown(RUNE_BLOOD))
             return false;
     }