diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java
index 5133551d5..97b002b1d 100644
--- a/src/main/java/me/blackvein/quests/Quester.java
+++ b/src/main/java/me/blackvein/quests/Quester.java
@@ -332,8 +332,6 @@ public class Quester {
     	if (questData.containsKey(quest)) {
     		return questData.get(quest);
     	}
-    	plugin.getLogger().warning("Data for quest " + quest.name + " returned null");
-    	plugin.getLogger().warning(questData.toString());
     	return null;
     }
 
diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java
index baab6a283..7a44aa2c3 100644
--- a/src/main/java/me/blackvein/quests/Quests.java
+++ b/src/main/java/me/blackvein/quests/Quests.java
@@ -2434,7 +2434,7 @@ try{
 
             for (Quest q : getQuester(player.getUniqueId()).currentQuests.keySet()) {
 
-            	if (getQuester(player.getUniqueId()).getQuestData(q) != null);
+            	try {
             	
                 if (getQuester(player.getUniqueId()).getQuestData(q).delayStartTime == 0) {
 
@@ -2449,6 +2449,10 @@ try{
                     }
 
                 }
+                
+            	} catch (Exception e) {
+            		//TODO find source of NullPointerException from Github ticket #130
+            	}
 
             }