From 1678410ab8c1d03e4dc7370f3a442827dcc6de43 Mon Sep 17 00:00:00 2001
From: HappyPikachu <dbaez4465@yahoo.com>
Date: Mon, 30 Jul 2018 16:33:25 -0400
Subject: [PATCH] Potential fix for #429

---
 src/main/java/me/blackvein/quests/Quester.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java
index 9fd43f4c8..fe668fc35 100644
--- a/src/main/java/me/blackvein/quests/Quester.java
+++ b/src/main/java/me/blackvein/quests/Quester.java
@@ -444,13 +444,14 @@ public class Quester {
 	}
 
 	public LinkedList<String> getObjectivesReal(Quest quest) {
-		if (getCurrentStage(quest).objectiveOverride != null) {
-			LinkedList<String> objectives = new LinkedList<String>();
-			objectives.add(ChatColor.GREEN + getCurrentStage(quest).objectiveOverride);
-			return objectives;
-		} else {
-			return getObjectives(quest);
+		if (getCurrentStage(quest) != null) {
+			if (getCurrentStage(quest).objectiveOverride != null) {
+				LinkedList<String> objectives = new LinkedList<String>();
+				objectives.add(ChatColor.GREEN + getCurrentStage(quest).objectiveOverride);
+				return objectives;
+			}
 		}
+		return getObjectives(quest);
 	}
 
 	public LinkedList<String> getObjectives(Quest quest) {