diff --git a/src/MobilePackageGen.Common/BuildMetadataHandler.cs b/src/MobilePackageGen.Common/BuildMetadataHandler.cs
index 4843417..d5ba08f 100644
--- a/src/MobilePackageGen.Common/BuildMetadataHandler.cs
+++ b/src/MobilePackageGen.Common/BuildMetadataHandler.cs
@@ -408,12 +408,12 @@ public static (string cabFileName, string cabFile) GetPackageNamingForCBS(XmlMum
                 {
                     foreach (UpdateHistory.Package Package in UpdateEvent.UpdateOSOutput.Packages.Package)
                     {
-                        if (Package.PackageFile.EndsWith(".mum", StringComparison.InvariantCultureIgnoreCase))
+                        if (Package.PackageIdentity == null || Package.PackageFile == null)
                         {
                             continue;
                         }
-
-                        if (Package.PackageIdentity == null)
+                        
+                        if (Package.PackageFile.EndsWith(".mum", StringComparison.InvariantCultureIgnoreCase))
                         {
                             continue;
                         }
@@ -468,6 +468,11 @@ public static (string cabFileName, string cabFile) GetPackageNamingForINF(string
                 {
                     foreach (UpdateHistory.Package Package in UpdateEvent.UpdateOSOutput.Packages.Package)
                     {
+                        if (Package.PackageFile == null)
+                        {
+                            continue;
+                        }
+                        
                         if (Package.PackageFile.EndsWith(".mum", StringComparison.InvariantCultureIgnoreCase))
                         {
                             continue;