1 files changed, 2 insertions, 2 deletions
diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
index dd7cfe6e..1a026d5f 100644
--- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
+++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java
@@ -41,7 +41,7 @@ public final class MobkillingCertainTaskType extends TaskType {
         Entity killer = event.getEntity().getKiller();
         Entity mob = event.getEntity();
 
-        if (mob instanceof Player) {
+        if (mob == null || mob instanceof Player) {
             return;
         }
 
@@ -77,7 +77,7 @@ public final class MobkillingCertainTaskType extends TaskType {
 
                     if (configName != null) {
                         configName = ChatColor.translateAlternateColorCodes('&', configName);
-                        if (!mob.getCustomName().equals(configName)) {
+                        if (mob.getCustomName() != null && !mob.getCustomName().equals(configName)) {
                             return;
                         }
                     }