diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 5d8df6de1d..95d652e04e 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1573,7 +1573,7 @@ bool Creature::IsWithinSightDist(Unit const* u) const
 
 bool Creature::canStartAttack(Unit const* who) const
 {
-    if(isCivilian()
+    if(isCivilian() || IsNeutralToAll()
         || !who->isInAccessiblePlaceFor(this)
         || !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE
         || !IsWithinDistInMap(who, GetAttackDistance(who)))
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 233ef09f4f..dfb2184094 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1222,7 +1222,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
             // Item cast can trigger only with spells with spellfamily
             if (procExtra & PROC_EX_INTERNAL_ITEM_CAST)
             {
-                if (!spellProcEvent->SpellFamilyName)
+                if (!spellProcEvent->spellFamilyName)
                     return false;
             }
             // Check (if set) for school