diff --git a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs index 537acd8f5c..c5db590209 100644 --- a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs +++ b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs @@ -104,8 +104,11 @@ private void SubscribeToFeatureLayerDataSourceChange(FeatureLayer layer) return; } Table layerTable = layer.GetTable(); - SubscribeToAnyDataSourceChange(layerTable); - SubscribedLayers.Add(layer); + if (layerTable != null) + { + SubscribeToAnyDataSourceChange(layerTable); + SubscribedLayers.Add(layer); + } } private void SubscribeToTableDataSourceChange(StandaloneTable table) @@ -115,8 +118,11 @@ private void SubscribeToTableDataSourceChange(StandaloneTable table) return; } Table layerTable = table.GetTable(); - SubscribeToAnyDataSourceChange(layerTable); - SubscribedTables.Add(table); + if (layerTable != null) + { + SubscribeToAnyDataSourceChange(layerTable); + SubscribedTables.Add(table); + } } private void SubscribeToAnyDataSourceChange(Table layerTable)