diff --git a/src/bcf/bcf/bcfxml.py b/src/bcf/bcf/bcfxml.py
index 4a8dcff867..513c64cdf2 100644
--- a/src/bcf/bcf/bcfxml.py
+++ b/src/bcf/bcf/bcfxml.py
@@ -16,12 +16,14 @@ def load(filepath):
             bcfxml = BcfXml()
             bcfxml.filepath = filepath
             return bcfxml
-        else:
+        elif version_id == "3.0":
             from bcf.v3.bcfxml import BcfXml
 
             bcfxml = BcfXml()
             bcfxml.filepath = filepath
             return bcfxml
+        else:
+            raise Exception(f"Version {version_id} not supported.")
 
 
 def get_version(version_path):
diff --git a/src/bcf/bcf/v3/bcfxml.py b/src/bcf/bcf/v3/bcfxml.py
index 3b3fcc8466..d7f0291146 100644
--- a/src/bcf/bcf/v3/bcfxml.py
+++ b/src/bcf/bcf/v3/bcfxml.py
@@ -151,10 +151,10 @@ class BcfXml:
             if value in data["Topic"]:
                 setattr(topic, key, data["Topic"][value])
 
-        if "ReferenceLinks" in data["Topic"]:
+        if data["Topic"].get("ReferenceLinks"):
             topic.reference_links.extend(data["Topic"]["ReferenceLinks"].get("ReferenceLink", []))
 
-        if "Labels" in data["Topic"]:
+        if data["Topic"].get("Labels"):
             topic.labels.extend(data["Topic"]["Labels"].get("Label", []))
 
         if "BimSnippet" in data["Topic"]: