diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index dfc1f56784..d35ba4185f 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -250,7 +250,11 @@ public class EntityArrow extends Entity implements IProjectile {
                                 }
                             }
 
-                            EnchantmentThorns.a(this.shooter, entityliving, this.random);
+                            // CraftBukkit start
+                            if (this.shooter != null) {
+                                EnchantmentThorns.a(this.shooter, entityliving, this.random);
+                            }
+                            // CraftBukkit end
                             if (this.shooter != null && movingobjectposition.entity != this.shooter && movingobjectposition.entity instanceof EntityHuman && this.shooter instanceof EntityPlayer) {
                                 ((EntityPlayer) this.shooter).playerConnection.sendPacket(new Packet70Bed(6, 0));
                             }