*Merge.

--HG--
branch : trunk

src/bindings/scripts/ScriptMgr.cpp

@@ -1679,6 +1679,8 @@ bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, u
 TRINITY_DLL_EXPORT
 bool GOSelect( Player *player, GameObject *_GO, uint32 sender, uint32 action )
 {
+    if(!_GO)
+	return false;
     debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
 
     Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
@@ -1691,6 +1693,8 @@ bool GOSelect( Player *player, GameObject *_GO, uint32 sender, uint32 action )
 TRINITY_DLL_EXPORT
 bool GOSelectWithCode( Player *player, GameObject *_GO, uint32 sender, uint32 action, const char* sCode )
 {
+    if(!_GO)
+	return false;
     debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
 
     Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];

src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp

@@ -268,7 +268,11 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
                     m_creature->RemoveAurasDueToSpell(SPELL_SUBMERGE);
                     //Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_SUBMERGE); //rotate and disappear
                 else
+                {
+                    Essence->AI()->EnterEvadeMode();
+                    Essence->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
                     return;
+                }
                 break;
             case 5:
                 if(Phase == 1)