diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
index 9f9350b07..fdb295f7b 100644
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
@@ -194,6 +194,12 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
         config = new Settings(getDataFolder());
 
         setupStorage();
+        if (!saves.load()) {
+            saves = null;
+            Messaging.severeF("Unable to load saves, disabling...");
+            getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
 
         npcRegistry = new CitizensNPCRegistry(saves);
         traitFactory = new CitizensTraitFactory();
@@ -270,6 +276,8 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
     }
 
     public void save() {
+        if (saves == null)
+            return;
         for (NPC npc : npcRegistry)
             ((CitizensNPC) npc).save(saves.getKey("npc." + npc.getId()));
 
@@ -292,7 +300,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
     // TODO: refactor
     private void setupNPCs() {
-        saves.load();
         int created = 0, spawned = 0;
         for (DataKey key : saves.getKey("npc").getIntegerSubKeys()) {
             int id = Integer.parseInt(key.name());
diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
index 4c742eca8..1fa05fdf8 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
@@ -35,7 +35,7 @@ public class CitizensHumanNPC extends CitizensNPC implements Equipable {
                 // set the head yaw in another tick - if done immediately,
                 // minecraft will not update it.
             }
-        }, 1);
+        }, 5);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return handle;
     }