diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index 932cbf0e..b9b89d7a 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -255,6 +255,9 @@ public class Mob extends AbstractIntelligenceAgent {
             this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
             this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
             this.firstName = rs.getString("mob_name");
+            if(this.firstName.isEmpty()){
+                this.firstName = this.mobBase.getFirstName();
+            }
             if (this.contract != null) {
                 this.equipmentSetID = this.contract.getEquipmentSet();
                 this.lastName = this.getContract().getName();
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 65bb4d36..a705e08b 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -240,7 +240,7 @@ public class NPC extends AbstractCharacter {
 				submitUpgradeJob();
 
 			this.name = rs.getString("npc_name");
-			if(this.building != null && this.building.getOwner() != null){
+			if(this.building != null && this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)){
 				this.name += " the " + this.contract.getName();
 			}