diff --git a/src/services/objects/ObjectCreator.java b/src/services/objects/ObjectCreator.java
index 213742870..65e7b310c 100644
--- a/src/services/objects/ObjectCreator.java
+++ b/src/services/objects/ObjectCreator.java
@@ -196,7 +196,9 @@ public final class ObjectCreator {
 	private static void handlePostCreation(SWGObject object, ObjectData attributes) {
 		addObjectAttributes(object, attributes);
 		createObjectSlots(object);
-		object.setGameObjectType(GameObjectType.getTypeFromId((Integer) object.getDataAttribute(ObjectDataAttribute.GAME_OBJECT_TYPE)));
+		Object got = object.getDataAttribute(ObjectDataAttribute.GAME_OBJECT_TYPE);
+		if (got != null)
+			object.setGameObjectType(GameObjectType.getTypeFromId((Integer) got));
 	}
 
 	private static void addObjectAttributes(SWGObject obj, ObjectData attributes) {