- fixes a null reference exception on implicit nav props detection

microsoftgraph · Sep 29, 2020 · 3ff2dd8 · 3ff2dd8
1 parent 5e806d9
commit 3ff2dd8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs b/src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs
@@ -257,18 +257,18 @@ public static OdcmProperty GetServiceCollectionNavigationPropertyForPropertyType
                             @namespace
                             .Classes
                             .Where(odcmClass => odcmClass.Kind == OdcmClassKind.Service)
-                            .First()
-                            .Properties
-                            .Where(property => property.GetType() == typeof(OdcmSingleton)) //Get the list of singletons defined by the service
-                            .Where(singleton => singleton
+                            .FirstOrDefault()
+                            ?.Properties
+                            ?.Where(property => property.GetType() == typeof(OdcmSingleton)) //Get the list of singletons defined by the service
+                            ?.Where(singleton => singleton
                                 .Type
                                 .AsOdcmClass()
                                 .Properties
                                 //Find navigation properties on the singleton that are self-contained (implicit EntitySets) that match the type
                                 //we are searching for
                                 .Where(prop => prop.ContainsTarget == true && prop.Type.Name == odcmProperty.Type.Name)
                                 .FirstOrDefault() != null
-                             )
+                             ) ?? new OdcmProperty[] { }
                          ).FirstOrDefault();
 
                     if (implicitProperty != null)