diff --git a/src/main/java/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
index 4a133f9f..65868f52 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/DisguiseRadiusCommand.java
@@ -39,6 +39,10 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
         for (EntityType type : EntityType.values()) {
             Class c = type.getEntityClass();
 
+            if (c == null) {
+                continue;
+            }
+
             while (!validClasses.contains(c)) {
                 validClasses.add(c);
 
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java b/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java
index fb844d29..e41d2111 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java
@@ -89,6 +89,10 @@ public class TranslateFiller {
         for (EntityType type : EntityType.values()) {
             Class c = type.getEntityClass();
 
+            if (c == null) {
+                continue;
+            }
+
             while (!validClasses.contains(c)) {
                 validClasses.add(c);