diff --git a/Messages.py b/Messages.py
index 6a88dfc..6243c0f 100644
--- a/Messages.py
+++ b/Messages.py
@@ -94,7 +94,7 @@ class NameMsg(IMessage):
         self.thing = thing
 
     def Serialize(self, buffer_ref):
-        if self.network_id is None or self.thing is None:
+        if self.network_id is None or self.thing is None or self.thing.name is None:
             return 0
 
         buffer: bytearray = buffer_ref[0]
@@ -124,7 +124,7 @@ class ModelUrlMsg(IMessage):
         self.thing = thing
     
     def Serialize(self, buffer_ref):
-        if self.network_id is None or self.thing is None:
+        if self.network_id is None or self.thing is None or self.thing.model_url is None:
             return 0
         
         buffer: bytearray = buffer_ref[0]
diff --git a/Thing.py b/Thing.py
index 13b4b6b..a39a350 100644
--- a/Thing.py
+++ b/Thing.py
@@ -9,11 +9,14 @@ class Thing:
     LinearVelocity = 0x04
     AngularVelocity = 0x08
 
-    def __init__(self):
+    def __init__(self, parent=None):
         self.networkId = 0
         self.id = 0
         self.type = 0
-        self.parent_id = 0
+        if parent is None:
+            self.parent_id = 0
+        else:
+            self.parent_id = parent.id
 
         self.name = None
         self.model_url = None