diff --git a/ISOv4Plugin/Mappers/PartfieldMapper.cs b/ISOv4Plugin/Mappers/PartfieldMapper.cs
index 8887a59..12be42f 100644
--- a/ISOv4Plugin/Mappers/PartfieldMapper.cs
+++ b/ISOv4Plugin/Mappers/PartfieldMapper.cs
@@ -93,8 +93,11 @@ public ISOPartfield ExportField(Field adaptField)
             FieldBoundary boundary = DataModel.Catalog.FieldBoundaries.SingleOrDefault(b => b.FieldId == adaptField.Id.ReferenceId);
             if (boundary != null)
             {
-                IEnumerable<ISOPolygon> isoPolygons = polygonMapper.ExportMultipolygon(boundary.SpatialData, ISOEnumerations.ISOPolygonType.PartfieldBoundary);
-                isoField.Polygons.AddRange(isoPolygons);
+                if (boundary.SpatialData != null)
+                {
+                    IEnumerable<ISOPolygon> isoPolygons = polygonMapper.ExportMultipolygon(boundary.SpatialData, ISOEnumerations.ISOPolygonType.PartfieldBoundary);
+                    isoField.Polygons.AddRange(isoPolygons);
+                }
             }
 
             //Guidance