1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp
index d8e6a0321c0..641c515ee98 100644
--- a/src/server/game/Achievements/CriteriaHandler.cpp
+++ b/src/server/game/Achievements/CriteriaHandler.cpp
@@ -4214,12 +4214,9 @@ void CriteriaMgr::LoadCriteriaList()
             scenarioCriteriaTreeIds[scenarioStep->Criteriatreeid] = scenarioStep;
 
     std::unordered_map<uint32 /*criteriaTreeID*/, QuestObjective const*> questObjectiveCriteriaTreeIds;
-    for (auto const& questTemplate : sObjectMgr->GetQuestTemplates())
+    for (auto const& questTemplatePair : sObjectMgr->GetQuestTemplates())
     {
-        if (!questTemplate)
-            continue;
-
-        for (QuestObjective const& objective : questTemplate->Objectives)
+        for (QuestObjective const& objective : questTemplatePair.second.Objectives)
         {
             if (objective.Type != QUEST_OBJECTIVE_CRITERIA_TREE)
                 continue;