diff --git a/server/AyaNova/biz/PartAssemblyBiz.cs b/server/AyaNova/biz/PartAssemblyBiz.cs
index 6df11e88..0adba8bd 100644
--- a/server/AyaNova/biz/PartAssemblyBiz.cs
+++ b/server/AyaNova/biz/PartAssemblyBiz.cs
@@ -109,7 +109,7 @@ namespace AyaNova.Biz
             if (logTheGetEvent && ret != null)
                 await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
 
-            if (populatePartNames && ret.Items.Count > 0)
+            if (populatePartNames && ret.Items!=null && ret.Items.Count > 0)
             {
                 var partIdList = ret.Items.Select(z => z.PartId).ToArray();
                 var PickList = PickListFactory.GetAyaPickList(AyaType.Part);