.NotNull will never return null, but cause Exception instead

specklesystems · Jun 26, 2024 · e328d82 · e328d82
1 parent 85c2ff6
commit e328d82
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs
@@ -71,20 +71,22 @@ public void HighlightModel(string modelCardId)
 
     var objectIds = new List<string>();
 
-    if (model is SenderModelCard senderModelCard)
+    try
     {
-      objectIds = senderModelCard.SendFilter.NotNull().GetObjectIds();
-    }
-
-    if (model is ReceiverModelCard receiverModelCard)
-    {
-      objectIds = receiverModelCard.BakedObjectIds.NotNull();
+      if (model is SenderModelCard senderModelCard)
+      {
+        objectIds = senderModelCard.SendFilter.NotNull().GetObjectIds();
+      }
+      else if (model is ReceiverModelCard receiverModelCard)
+      {
+        objectIds = receiverModelCard.BakedObjectIds.NotNull();
+      }
     }
-
-    if (objectIds is null)
+    catch (ArgumentNullException)
     {
       return;
     }
+
     HighlightObjectsOnView(objectIds);
   }