diff --git a/forge-gui/src/main/java/forge/quest/QuestController.java b/forge-gui/src/main/java/forge/quest/QuestController.java index c415860e18c..eab7ba47f4a 100644 --- a/forge-gui/src/main/java/forge/quest/QuestController.java +++ b/forge-gui/src/main/java/forge/quest/QuestController.java @@ -155,7 +155,8 @@ public class QuestController { if (draftDecks == null) { draftDecks = new QuestDeckGroupMap(new HashMap()); } - if (this.getAchievements().getCurrentDraftIndex() == -1 || this.getAchievements().getCurrentDraft() == null) { + final QuestAchievements achievements = this.getAchievements(); + if (achievements != null && (achievements.getCurrentDraftIndex() == -1 || achievements.getCurrentDraft() == null)) { draftDecks.delete(QuestEventDraft.DECK_NAME); } return draftDecks;