diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
index 825f6e84..6190e6d8 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
@@ -319,6 +319,10 @@ public class Disguise implements NbtSerialisable {
     }
 
     private static void getCollissionShapes(Entity entity, ShapeContext context, Consumer<VoxelShape> output) {
+        if (entity == null) {
+            return;
+        }
+
         if (entity.method_30948()) {
             output.accept(VoxelShapes.cuboid(entity.getBoundingBox()));
         } else if (entity instanceof FallingBlockEntity) {