merge

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index af242455f5c..a57456a71c6 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -504,10 +504,16 @@ void AuctionHouseObject::Update()
     time_t curTime = sWorld.GetGameTime();
     ///- Handle expired auctions
 
+    // If storage is empty, no need to update.
+    if (AuctionsMap.empty())
+        return;
+
     // reset next if at end of map
     if (next == AuctionsMap.end())
         next = AuctionsMap.begin();
 
+    ASSERT(next != NULL);
+
     uint32 loopBreaker = 0;
 
     // Initialize itr with next. next is stored for future calls to Update() after