diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
index 1c0e59e3f..425b5b6c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
@@ -116,11 +116,15 @@ public class CraftTippedArrow extends CraftArrow implements Arrow {
 
     @Override
     public void setColor(Color color) {
-        getHandle().setFixedColor(color.asRGB());
+        int colorRGB = (color == null) ? -1 : color.asRGB();
+        getHandle().setFixedColor(colorRGB);
     }
 
     @Override
     public Color getColor() {
+        if (getHandle().getColor() <= -1) {
+            return null;
+        }
         return Color.fromRGB(getHandle().getColor());
     }
 }