diff --git a/src/engine/devcmd/cmds/AddNPCCmd.java b/src/engine/devcmd/cmds/AddNPCCmd.java
index 2883a39f..8b717d53 100644
--- a/src/engine/devcmd/cmds/AddNPCCmd.java
+++ b/src/engine/devcmd/cmds/AddNPCCmd.java
@@ -86,13 +86,15 @@ public class AddNPCCmd extends AbstractDevCmd {
             loc = pc.loc;
         }
         created = NPC.createNPC(name, contractID, loc, guild, zone, (short)level, building);
+        created.bindLoc = loc;
         if(building != null) {
-        created.buildingUUID = building.getObjectUUID();
-        created.building = building;
-
+            created.buildingUUID = building.getObjectUUID();
+            created.building = building;
             NPCManager.slotCharacterInBuilding(created);
         }
         created.setLoc(created.bindLoc);
+        created.updateDatabase();
+        throwbackInfo(pc, "Created NPC with UUID: " + created.getObjectUUID());
     }
 
     @Override
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 24f59898..0eeefd3d 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -470,8 +470,11 @@ public class NPC extends AbstractCharacter {
             newNPC.bindLoc = Vector3fImmutable.ZERO;
 
         newNPC.parentZoneUUID = parent.getObjectUUID();
-        newNPC.guildUUID = guild.getObjectUUID();
-
+        if(guild == null){
+            newNPC.guildUUID = Guild.getErrantGuild().getObjectUUID();
+        }else {
+            newNPC.guildUUID = guild.getObjectUUID();
+        }
         if (building == null)
             newNPC.buildingUUID = 0;
         else