diff --git a/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java b/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
index d7a7951d53..5ba4082f8d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
@@ -22,7 +22,9 @@ public final class CraftMemoryMapper {
     }
 
     public static Object toNms(Object object) {
-        if (object instanceof Location) {
+        if (object == null) {
+            return null;
+        } else if (object instanceof Location) {
             return toNms((Location) object);
         }