diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index a103e504ee2..06026689f65 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -52,7 +52,7 @@ bool ChatHandler::HandleNpcSayCommand(char* args)
         return false;
     }
 
-    pCreature->MonsterSay(args, LANG_UNIVERSAL);
+    pCreature->MonsterSay(args, LANG_UNIVERSAL, m_session->GetPlayer());
 
     return true;
 }
@@ -70,7 +70,7 @@ bool ChatHandler::HandleNpcYellCommand(char* args)
         return false;
     }
 
-    pCreature->MonsterYell(args, LANG_UNIVERSAL);
+    pCreature->MonsterYell(args, LANG_UNIVERSAL, m_session->GetPlayer());
 
     return true;
 }
@@ -90,7 +90,7 @@ bool ChatHandler::HandleNpcTextEmoteCommand(char* args)
         return false;
     }
 
-    pCreature->MonsterTextEmote(args, NULL);
+    pCreature->MonsterTextEmote(args, m_session->GetPlayer());
 
     return true;
 }
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 7b1a99d3623..38ad1856e86 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10046,11 +10046,8 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* pTarget, uint32 procFlag,
         // check if that aura is triggered by proc event (then it will be managed by proc handler)
         if (!IsTriggeredAtSpellProcEvent(pTarget, itr->second, procSpell, procFlag, procExtra, attType, isVictim, spellProcEvent))
         {
-            const SpellEntry* se = itr->second->GetSpellProto();
-            if (!se)
-                continue;
-
             // spell seem not managed by proc system, although some case need to be handled
+            const SpellEntry* se = itr->second->GetSpellProto();
 
             // check if the aura is interruptible by damage (not remove self added aura)
             if (procSpell && procSpell->Id != se->Id && se->AuraInterruptFlags & AURA_INTERRUPT_FLAG_DAMAGE)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1f14be56917..8fd7de3b933 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12598"
+ #define REVISION_NR "12599"
 #endif // __REVISION_NR_H__