diff --git a/src/blenderbim/blenderbim/tool/geometry.py b/src/blenderbim/blenderbim/tool/geometry.py
index 5dfc29e69a..f0232a5826 100644
--- a/src/blenderbim/blenderbim/tool/geometry.py
+++ b/src/blenderbim/blenderbim/tool/geometry.py
@@ -313,7 +313,7 @@ class Geometry(blenderbim.core.tool.Geometry):
         return (
             subcontext.ContextType,
             subcontext.ContextIdentifier,
-            subcontext.TargetView,
+            getattr(subcontext, "TargetView", None),
         )
 
     @classmethod
diff --git a/src/ifcfm/ifcfm/cobie24.py b/src/ifcfm/ifcfm/cobie24.py
index d45f8fbbd2..7f94ae3187 100644
--- a/src/ifcfm/ifcfm/cobie24.py
+++ b/src/ifcfm/ifcfm/cobie24.py
@@ -282,20 +282,20 @@ def get_contact_data(ifc_file, element):
         "CreatedOn": get_created_on(element),
         "Category": ",".join(roles),
         "Company": getattr(organization, "Name", None),
-        "Phone": get_pao_address(person, organisation, "TelephoneNumbers"),
+        "Phone": get_pao_address(person, organization, "TelephoneNumbers"),
         "ExternalSystem": get_external_system(element),
         "ExternalObject": element.is_a(),
         "ExternalIdentifier": element.GlobalId,
-        "Department": get_pao_address(person, organisation, "InternalLocation"),
+        "Department": get_pao_address(person, organization, "InternalLocation"),
         "OrganizationCode": getattr(organization, "Id", getattr(organization, "Identification", None)),
         "GivenName": getattr(person, "GivenName", None),
         "FamilyName": getattr(person, "FamilyName", None),
-        "Street": get_pao_address(person, organisation, "AddressLines"),
-        "PostalBox": get_pao_address(person, organisation, "PostalBox"),
-        "Town": get_pao_address(person, organisation, "Town"),
-        "StateRegion": get_pao_address(person, organisation, "Region"),
-        "PostalCode": get_pao_address(person, organisation, "PostalCode"),
-        "Country": get_pao_address(person, organisation, "Country"),
+        "Street": get_pao_address(person, organization, "AddressLines"),
+        "PostalBox": get_pao_address(person, organization, "PostalBox"),
+        "Town": get_pao_address(person, organization, "Town"),
+        "StateRegion": get_pao_address(person, organization, "Region"),
+        "PostalCode": get_pao_address(person, organization, "PostalCode"),
+        "Country": get_pao_address(person, organization, "Country"),
     }
 
 
@@ -417,6 +417,7 @@ def get_space_data(ifc_file, element):
         "ExternalSystem": get_external_system(element),
         "ExternalObject": element.is_a(),
         "ExternalIdentifier": element.GlobalId,
+        # Stopped here
         "RoomTag": room_tag,
         "UsableHeight": usable_height,
         "GrossArea": gross_area,