diff --git a/PepApi.Core/PepHelper.cs b/PepApi.Core/PepHelper.cs
index 5e54603..db24f65 100644
--- a/PepApi.Core/PepHelper.cs
+++ b/PepApi.Core/PepHelper.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using PepLib;
 using Material = PepApi.Core.Models.Material;
 using Part = PepApi.Core.Models.Part;
@@ -171,7 +169,7 @@ namespace PepApi.Core
                 var part = new Part
                 {
                     Name = drawing.Name,
-                    QtyRequired = dwg.QtyRequired
+                    QtyRequired = dwg?.QtyRequired ?? 0
                 };
 
                 UpdateQtyNested(part, nest);
@@ -217,7 +215,7 @@ namespace PepApi.Core
             foreach (var item in uniquePlates)
             {
                 var plate = item.First();
-                plate.Name = null;
+                plate.Name = string.Empty;
                 plate.Qty = item.Sum((Plate p) => p.Qty);
 
                 combinedPlatesList.Add(plate);