diff --git a/mitm_tooling/extraction/sql/data_models/db_probe.py b/mitm_tooling/extraction/sql/data_models/db_probe.py
index e8c6a54fd67ba5b8e47f28752896c0ead13f3da0..3de92f4478d4853b518ed47b82347846410ee303 100644
--- a/mitm_tooling/extraction/sql/data_models/db_probe.py
+++ b/mitm_tooling/extraction/sql/data_models/db_probe.py
@@ -81,6 +81,8 @@ class DBProbe(DBProbeBase):
     def update_probes(self, *probes: tuple[ShortTableIdentifier, TableProbe]):
         for ti, tp in probes:
             schema_name, table_name = ti
+            if not schema_name in self.db_structured_table_probes:
+                self.db_structured_table_probes[schema_name] = {}
             self.db_structured_table_probes[schema_name][table_name] = tp
 
     def drop_probes(self, *to_drop: ShortTableIdentifier):
diff --git a/mitm_tooling/extraction/sql/mapping/export.py b/mitm_tooling/extraction/sql/mapping/export.py
index 539c18850025c38963603b743703f76590c9ea32..826d4c1be8965938fd298d7ae5bbea8118c3aba8 100644
--- a/mitm_tooling/extraction/sql/mapping/export.py
+++ b/mitm_tooling/extraction/sql/mapping/export.py
@@ -97,7 +97,7 @@ class MappingExport(pydantic.BaseModel):
         data_providers: dict[ConceptName, list[DataProvider]] = {}
 
         meta = sa.MetaData(schema='export')
-        for concept_mapping in self.mapped_concepts:
+        for i, concept_mapping in enumerate(self.mapped_concepts):
             if concept_mapping.mitm != self.mitm:
                 continue