diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 9855f18a5..f6774dc01 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -587,7 +587,7 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
     GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE, text_emote, 0, unit);
 
     //Send scripted event call
-    if (unit->GetTypeId()==TYPEID_UNIT && Script)
+    if (unit && unit->GetTypeId()==TYPEID_UNIT && Script)
         Script->ReceiveEmote(GetPlayer(),(Creature*)unit,text_emote);
 }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 613dbfd14..94f4934ed 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 "7481"
+ #define REVISION_NR "7482"
 #endif // __REVISION_NR_H__