diff --git a/data/sql/updates/pending_db_world/rev_1723527950527197400.sql b/data/sql/updates/pending_db_world/rev_1723527950527197400.sql
new file mode 100644
index 000000000..82f897606
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1723527950527197400.sql
@@ -0,0 +1,4 @@
+
+UPDATE creature_template
+SET gossip_menu_id = 1291
+WHERE entry = 1247;
\ No newline at end of file
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b4136a07e..962bce9b4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -715,6 +715,9 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons
 /*static*/ uint32 Unit::DealDamage(
     Unit* attacker, Unit* victim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellInfo const* spellProto, bool durabilityLoss)
 {
+    if (!attacker)
+        return false;
+
     // Sparring Checks
     if (Creature* target = victim->ToCreature())
     {