diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
index 5aa11a239..ef79dca9e 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
@@ -46,8 +46,8 @@ public class CitizensNPCRegistry implements NPCRegistry {
     private final Map<EntityType, Class<? extends CitizensNPC>> types = new EnumMap<EntityType, Class<? extends CitizensNPC>>(
             EntityType.class);
 
-    public CitizensNPCRegistry(NPCDataStore saves) {
-        this.saves = saves;
+    public CitizensNPCRegistry(NPCDataStore store) {
+        saves = store;
 
         types.put(EntityType.BLAZE, CitizensBlazeNPC.class);
         types.put(EntityType.CAVE_SPIDER, CitizensCaveSpiderNPC.class);
@@ -143,7 +143,7 @@ public class CitizensNPCRegistry implements NPCRegistry {
         if (entity == null)
             return null;
         net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle();
-        return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;
+        return handle != null && handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;
     }
 
     @Override
diff --git a/src/main/java/net/citizensnpcs/util/Messages.java b/src/main/java/net/citizensnpcs/util/Messages.java
index 18efa0565..6a12a5d90 100644
--- a/src/main/java/net/citizensnpcs/util/Messages.java
+++ b/src/main/java/net/citizensnpcs/util/Messages.java
@@ -85,6 +85,7 @@ public class Messages {
     public static final String METRICS_ERROR_NOTIFICATION = "citizens.notifications.metrics-load-error";
     public static final String METRICS_NOTIFICATION = "citizens.notifications.metrics-started";
     public static final String MINIMUM_COST_REQUIRED = "citizens.economy.minimum-cost-required";
+    public static final String MISSING_TRANSLATIONS = "citizens.notifications.missing-translations";
     public static final String MOBTYPE_CANNOT_BE_AGED = "citizens.commands.npc.age.cannot-be-aged";
     public static final String MONEY_WITHDRAWN = "citizens.economy.money-withdrawn";
     public static final String NO_NPC_WITH_ID_FOUND = "citizens.commands.npc.spawn.missing-npc-id";
@@ -152,7 +153,6 @@ public class Messages {
     public static final String VULNERABLE_STOPPED = "citizens.commands.npc.vulnerable.stopped";
     public static final String WAYPOINT_PROVIDER_SET = "citizens.waypoints.set-provider";
     public static final String WRITING_DEFAULT_SETTING = "citizens.settings.writing-default";
-    public static final String MISSING_TRANSLATIONS = "citizens.notifications.missing-translations";
 
     private static Properties getDefaultBundleProperties() {
         Properties defaults = new Properties();
diff --git a/src/main/java/net/citizensnpcs/util/Translator.java b/src/main/java/net/citizensnpcs/util/Translator.java
index aacedaf8d..65e528f9c 100644
--- a/src/main/java/net/citizensnpcs/util/Translator.java
+++ b/src/main/java/net/citizensnpcs/util/Translator.java
@@ -146,6 +146,7 @@ public class Translator {
                 }
             };
             try {
+                rootFolder.mkdirs();
                 File to = File.createTempFile(fileName, null, rootFolder);
                 to.deleteOnExit();
                 Files.copy(in, to);