*Fix a crash caused by npc_overlord_morghorAI script.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
index ad851eeaa1f..d5035d2cfc1 100644
--- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
@@ -718,6 +718,12 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI
 
         Unit* Illi = Unit::GetUnit((*m_creature), IllidanGUID);
 
+        if(!plr || !Illi)
+        {
+            EnterEvadeMode();
+            return;
+        }
+
         switch(Step)
         {
         case 0: return 0; break;