diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
index c493c9c0c3..dd9c659399 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
@@ -55,14 +55,6 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
     public Entity getSource() {
         EntityLiving source = getHandle().getSource();
 
-        if (source != null) {
-            Entity bukkitEntity = source.getBukkitEntity();
-
-            if (bukkitEntity.isValid()) {
-                return bukkitEntity;
-            }
-        }
-
-        return null;
+        return (source != null) ? source.getBukkitEntity() : null;
     }
 }