diff --git a/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java b/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java
index 96d06cff6..b9d4e4ade 100644
--- a/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java
+++ b/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java
@@ -213,10 +213,12 @@ public class LocaleQuery {
 		if (oldVersion) {
 			if (type.name().equals("VILLAGER") && Career.valueOf(extra) != null) {
 				key = oldEntities.get(type.name() + "." + Career.valueOf(extra).name());
-			} else if (type.name().equals("OCELOT") && Ocelot.Type.valueOf(extra) != null){
+			} else if (type.name().equals("OCELOT") && Ocelot.Type.valueOf(extra) != null) {
 				key = oldEntities.get(type.name() + "." + Ocelot.Type.valueOf(extra).name());
-			} else if (type.name().equals("RABBIT") && Rabbit.Type.valueOf(extra).equals(Rabbit.Type.THE_KILLER_BUNNY)) {
-				key = oldEntities.get(type.name() + "." + Rabbit.Type.valueOf(extra).name());
+			} else if (type.name().equals("RABBIT") && Rabbit.Type.valueOf(extra) != null) {
+				if (Rabbit.Type.valueOf(extra).equals(Rabbit.Type.THE_KILLER_BUNNY)) {
+					key = oldEntities.get(type.name() + "." + Rabbit.Type.valueOf(extra).name());
+				}
 			} else {
 				key = oldEntities.get(type.name());
 			}