diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index adacb60a4b..15c62552e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -105,7 +105,7 @@ class CraftTask implements BukkitTask, Runnable {
     }
 
     Class<?> getTaskClass() {
-        return (rTask != null) ? rTask.getClass() : cTask.getClass();
+        return (rTask != null) ? rTask.getClass() : ((cTask != null) ? cTask.getClass() : null);
     }
 
     @Override