Minor BugFix

admin-shell-io · Oct 10, 2023 · 1b2f24d · 1b2f24d
1 parent 07c1e21
commit 1b2f24d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/AasxCsharpLibrary/Extensions/ExtendEnvironment.cs b/src/AasxCsharpLibrary/Extensions/ExtendEnvironment.cs
@@ -603,6 +603,9 @@ public static IConceptDescription FindConceptDescriptionById(
             if (string.IsNullOrEmpty(cdId))
                 return null;
 
+            if (env.ConceptDescriptions == null || env.ConceptDescriptions.Count == 0)
+                return null;
+
             var conceptDescription = env.ConceptDescriptions.Where(c => c.Id.Equals(cdId)).FirstOrDefault();
             return conceptDescription;
         }