diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
index bfe9733dbf..08d48af630 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
@@ -270,6 +270,8 @@ class CreateDrawing(bpy.types.Operator):
             if obj == self.camera:
                 continue
             element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            if element.is_a("IfcTypeProduct"):
+                continue
             representation = ifcopenshell.util.representation.get_representation(
                 element, "Plan", "Annotation", self.camera.data.BIMCameraProperties.target_view
             )
diff --git a/src/blenderbim/blenderbim/bim/module/geometry/operator.py b/src/blenderbim/blenderbim/bim/module/geometry/operator.py
index 67e2ec0c83..3cd832d83e 100644
--- a/src/blenderbim/blenderbim/bim/module/geometry/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/geometry/operator.py
@@ -154,13 +154,14 @@ class AddRepresentation(bpy.types.Operator):
         obj.data = mesh
         Data.load(IfcStore.get_file(), obj.BIMObjectProperties.ifc_definition_id)
 
-        if self.file.schema == "IFC2X3":
-            types = product.ObjectTypeOf
-        else:
-            types = product.Types
-        if product.is_a("IfcTypeProduct") and types:
-            for element in types[0].RelatedObjects:
-                Data.load(IfcStore.get_file(), element.id())
+        if product.is_a("IfcTypeProduct"):
+            if self.file.schema == "IFC2X3":
+                types = product.ObjectTypeOf
+            else:
+                types = product.Types
+            if types:
+                for element in types[0].RelatedObjects:
+                    Data.load(IfcStore.get_file(), element.id())
         return {"FINISHED"}
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/model/pie.py b/src/blenderbim/blenderbim/bim/module/model/pie.py
index b19a258f4c..10188e2b18 100644
--- a/src/blenderbim/blenderbim/bim/module/model/pie.py
+++ b/src/blenderbim/blenderbim/bim/module/model/pie.py
@@ -116,7 +116,7 @@ class VIEW3D_MT_PIE_bim(bpy.types.Menu):
     def draw(self, context):
         pie = self.layout.menu_pie()
         pie.operator("bim.edit_object_placement")
-        pie.operator("bim.update_mesh_representation")
+        pie.operator("bim.update_representation")
         pie.operator("bim.pie_add_opening")
         pie.operator("bim.pie_update_container")
         pie.operator("bim.open_pie_class", text="Assign IFC Class")