diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
index 247b12d4e..b790bb66a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -592,7 +592,8 @@ public class HologramTrait extends Trait {
 
         @Override
         public Collection<Entity> getEntities() {
-            return hologram != null ? ImmutableList.of(hologram.getEntity()) : Collections.emptyList();
+            return hologram != null && hologram.getEntity() != null ? ImmutableList.of(hologram.getEntity())
+                    : Collections.emptyList();
         }
 
         @Override
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
index 722f95a44..c1b556672 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
@@ -106,12 +106,6 @@ public class FoxTrait extends Trait {
         this.type = type;
     }
 
-    public enum FoxModifier {
-        FACEPLANTED,
-        INTERESTED,
-        POUNCING;
-    }
-
     @Command(
             aliases = { "npc" },
             usage = "fox --type type --sleeping [true|false] --sitting [true|false] --crouching [true|false] --interested [true|false] --pouncing [true|false] --faceplanted [true|false]",