diff --git a/multi_user/bl_types/bl_camera.py b/multi_user/bl_types/bl_camera.py
index 4941810..4c30b96 100644
--- a/multi_user/bl_types/bl_camera.py
+++ b/multi_user/bl_types/bl_camera.py
@@ -46,8 +46,7 @@ class BlCamera(BlDatablock):
         return dumper.dump(pointer)
 
     def resolve(self):
-        assert(self.data)
-        self.pointer = bpy.data.cameras.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.cameras)
 
     def is_valid(self):
         return bpy.data.cameras.get(self.data['name'])
diff --git a/multi_user/bl_types/bl_curve.py b/multi_user/bl_types/bl_curve.py
index c45e61f..0b73eb6 100644
--- a/multi_user/bl_types/bl_curve.py
+++ b/multi_user/bl_types/bl_curve.py
@@ -46,8 +46,7 @@ class BlCurve(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)      
-        self.pointer = bpy.data.curves.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.curves)
 
     def is_valid(self):
         return bpy.data.curves.get(self.data['name'])
diff --git a/multi_user/bl_types/bl_gpencil.py b/multi_user/bl_types/bl_gpencil.py
index 74e4ca6..bcf0c91 100644
--- a/multi_user/bl_types/bl_gpencil.py
+++ b/multi_user/bl_types/bl_gpencil.py
@@ -65,8 +65,7 @@ class BlGpencil(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
-        self.pointer = bpy.data.grease_pencils.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.grease_pencils)
 
     def resolve_dependencies(self):
         deps = []
diff --git a/multi_user/bl_types/bl_image.py b/multi_user/bl_types/bl_image.py
index f7eb60e..b041358 100644
--- a/multi_user/bl_types/bl_image.py
+++ b/multi_user/bl_types/bl_image.py
@@ -59,8 +59,7 @@ class BlImage(BlDatablock):
         return data
     
     def resolve(self):
-        assert(self.data)      
-        self.pointer = bpy.data.images.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.images)
 
     def diff(self):
         return False
diff --git a/multi_user/bl_types/bl_library.py b/multi_user/bl_types/bl_library.py
index 1302563..49107ab 100644
--- a/multi_user/bl_types/bl_library.py
+++ b/multi_user/bl_types/bl_library.py
@@ -18,8 +18,7 @@ class BlLibrary(BlDatablock):
         return utils.dump_datablock(pointer, 1)
 
     def resolve(self):
-        assert(self.data)
-        self.pointer = bpy.data.libraries.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.libraries)
 
     # def diff(self):
     #     return (self.bl_diff())
diff --git a/multi_user/bl_types/bl_light.py b/multi_user/bl_types/bl_light.py
index 909ba69..9739219 100644
--- a/multi_user/bl_types/bl_light.py
+++ b/multi_user/bl_types/bl_light.py
@@ -40,7 +40,6 @@ class BlLight(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
         self.pointer = bpy.data.lights.get(self.data['name'])
 
     def is_valid(self):
diff --git a/multi_user/bl_types/bl_material.py b/multi_user/bl_types/bl_material.py
index 4a797fc..424be52 100644
--- a/multi_user/bl_types/bl_material.py
+++ b/multi_user/bl_types/bl_material.py
@@ -127,7 +127,6 @@ class BlMaterial(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
         self.pointer = bpy.data.materials.get(self.data['name'])
 
     def resolve_dependencies(self):
diff --git a/multi_user/bl_types/bl_mesh.py b/multi_user/bl_types/bl_mesh.py
index 78f3b06..8db65f6 100644
--- a/multi_user/bl_types/bl_mesh.py
+++ b/multi_user/bl_types/bl_mesh.py
@@ -155,7 +155,6 @@ class BlMesh(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
         self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.meshes) 
         # self.pointer = bpy.data.meshes.get(self.data['name'])
 
diff --git a/multi_user/bl_types/bl_metaball.py b/multi_user/bl_types/bl_metaball.py
index f01b193..06dc27b 100644
--- a/multi_user/bl_types/bl_metaball.py
+++ b/multi_user/bl_types/bl_metaball.py
@@ -27,7 +27,6 @@ class BlMetaball(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
         self.pointer = bpy.data.metaballs.get(self.data['name'])
 
     def is_valid(self):
diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py
index 094a254..b0c86f3 100644
--- a/multi_user/bl_types/bl_object.py
+++ b/multi_user/bl_types/bl_object.py
@@ -96,7 +96,6 @@ class BlObject(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
         self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.objects)
         # object_name = self.data['name']
         # try:
diff --git a/multi_user/bl_types/bl_scene.py b/multi_user/bl_types/bl_scene.py
index 1c73fb7..f8a9ca4 100644
--- a/multi_user/bl_types/bl_scene.py
+++ b/multi_user/bl_types/bl_scene.py
@@ -55,7 +55,6 @@ class BlScene(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
         scene_name = self.data['name']
         
         self.pointer = bpy.data.scenes.get(scene_name)
diff --git a/multi_user/bl_types/bl_world.py b/multi_user/bl_types/bl_world.py
index 9e04831..712174e 100644
--- a/multi_user/bl_types/bl_world.py
+++ b/multi_user/bl_types/bl_world.py
@@ -84,8 +84,7 @@ class BlWorld(BlDatablock):
         return data
 
     def resolve(self):
-        assert(self.data)
-        self.pointer = bpy.data.worlds.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.worlds)
 
     def resolve_dependencies(self):
         deps = []
diff --git a/multi_user/libs/replication b/multi_user/libs/replication
index 63abb55..e5fa814 160000
--- a/multi_user/libs/replication
+++ b/multi_user/libs/replication
@@ -1 +1 @@
-Subproject commit 63abb5584fff5f43a313af60ce40953cae72f522
+Subproject commit e5fa814ef5bc6f9a5987879e06cdd0a33f8f23d6