From bf3bcf05881b110132cee74c5fc2562914241078 Mon Sep 17 00:00:00 2001
From: HappyPikachu <dbaez4465@yahoo.com>
Date: Sat, 29 Jul 2017 10:58:18 -0400
Subject: [PATCH] Mitigate #84

---
 src/main/java/me/blackvein/quests/PlayerListener.java | 8 +++++---
 src/main/java/me/blackvein/quests/Quests.java         | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/PlayerListener.java b/src/main/java/me/blackvein/quests/PlayerListener.java
index e91c11196..3b97f9e28 100644
--- a/src/main/java/me/blackvein/quests/PlayerListener.java
+++ b/src/main/java/me/blackvein/quests/PlayerListener.java
@@ -674,9 +674,11 @@ public class PlayerListener implements Listener {
 			}
 			if (isPlayer) {
 				Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
-				for (Quest quest : quester.currentQuests.keySet()) {
-					if (quester.hasObjective(quest, "reachLocation")) {
-						quester.reachLocation(quest, evt.getTo());
+				if (quester != null) {
+					for (Quest quest : quester.currentQuests.keySet()) {
+						if (quester.hasObjective(quest, "reachLocation")) {
+							quester.reachLocation(quest, evt.getTo());
+						}
 					}
 				}
 			}
diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java
index 93e8aab79..810dfe649 100644
--- a/src/main/java/me/blackvein/quests/Quests.java
+++ b/src/main/java/me/blackvein/quests/Quests.java
@@ -1936,7 +1936,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
 		}
 		if (quester == null) {
 			if (!questerBlacklist.contains(id.toString())) {
-				getLogger().log(Level.WARNING, "Quester data for UUID \"" + id.toString() + "\" not stored. Attempting manual data retrieval..");
+				getLogger().log(Level.WARNING, "Quester data for UUID \"" + id.toString() + "\" not stored. Attempting manual data retrieval...");
 			}
 			quester = new Quester(this);
 			quester.id = id;