diff --git a/ngengine_public.jar b/ngengine_public.jar
index c484a21a..c5451df1 100644
Binary files a/ngengine_public.jar and b/ngengine_public.jar differ
diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 10795671..cac72183 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -210,6 +210,10 @@ public class CreatureObject extends TangibleObject implements Serializable {
 	@Override
 	public void initAfterDBLoad() {
 		super.init();
+		duelList = Collections.synchronizedList(new ArrayList<CreatureObject>());
+		cooldowns = new ConcurrentHashMap<String, Long>();
+		performanceAudience = new Vector<CreatureObject>();
+		tefTime = System.currentTimeMillis();
 		messageBuilder = new CreatureMessageBuilder(this);
 	}
 
diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java
index 02fe6db7..f9319a8d 100644
--- a/src/resources/objects/player/PlayerObject.java
+++ b/src/resources/objects/player/PlayerObject.java
@@ -163,6 +163,7 @@ public class PlayerObject extends IntangibleObject implements Serializable {
 	@Override
 	public void initAfterDBLoad() {
 		super.init();
+		lastPlayTimeUpdate = System.currentTimeMillis();
 		messageBuilder = new PlayerMessageBuilder(this);
 	}
 
diff --git a/src/resources/objects/resource/GalacticResource.java b/src/resources/objects/resource/GalacticResource.java
index 22aa0647..eb8d1635 100644
--- a/src/resources/objects/resource/GalacticResource.java
+++ b/src/resources/objects/resource/GalacticResource.java
@@ -147,6 +147,7 @@ public class GalacticResource extends SWGObject implements Serializable {
 	
 	@Override
 	public void initAfterDBLoad() {
+		init();
 	}
 	
 	public GalacticResource(String name, String fileName, String category){
diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index 4ff23de7..b9453038 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -180,7 +180,7 @@ public class ObjectService implements INetworkDispatch {
 				
 		while(cursor.hasNext()) {
 			final SWGObject building = (SWGObject) cursor.next();
-			if(!(building instanceof BuildingObject))
+			if(!(building instanceof BuildingObject) || building == null)
 				continue;
 			objectList.put(building.getObjectID(), building);
 			Planet planet = core.terrainService.getPlanetByID(building.getPlanetId());