diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index 3dcebfae..38baef96 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -2090,6 +2090,9 @@ Actual macro pathfinding implementation
 Enable AI for low-lod entities
 Fix draw cell manager test
 
+(05/31/2025)
+Error logging in entity-character assignment
+
 
 
 
diff --git a/src/main/java/electrosphere/entity/state/server/ServerCharacterData.java b/src/main/java/electrosphere/entity/state/server/ServerCharacterData.java
index 1a57e2a3..4d6e457f 100644
--- a/src/main/java/electrosphere/entity/state/server/ServerCharacterData.java
+++ b/src/main/java/electrosphere/entity/state/server/ServerCharacterData.java
@@ -36,6 +36,9 @@ public class ServerCharacterData {
      * @param charaData The character data
      */
     public static void attachServerCharacterData(Entity entity, Character charaData){
+        if(entity.containsKey(EntityDataStrings.TREE_SERVERCHARACTERDATA)){
+            throw new Error("Server character data already attached!");
+        }
         ServerCharacterData tree = new ServerCharacterData(entity, charaData);
         entity.putData(EntityDataStrings.TREE_SERVERCHARACTERDATA, tree);
         Globals.serverState.characterService.setEntity(charaData, entity);