Merge heads.

--HG--
branch : trunk

1 files changed, 5 insertions, 0 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 1f3e4e120f9..d2d2bbafe4e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -13717,6 +13717,11 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
         uint32 personal_rating = fields[3].GetUInt32();
 
         ArenaTeam* aTeam = objmgr.GetArenaTeamById(arenateamid);
+        if(!aTeam)
+        {
+            sLog.outError("FATAL: couldn't load arenateam %u", arenateamid);
+            continue;
+        }
         uint8  arenaSlot = aTeam->GetSlot();
 
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6]     = arenateamid;      // TeamID