diff --git a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index 605f2730..45787c79 100644
--- a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -423,7 +423,7 @@ namespace ENI2.DetailViewControls
             {
                 SERV newServ = new SERV();
                 newServ.ServiceBeneficiary = "Sealand Europe A/S, Dampfaergevej 10, 3.tv, DK- 2100 Copenhagen, VAT-ID: DK53139655";
-                newServ.ServiceInvoiceRecipient = "Sealand Europe Deutschland A/S & Co. KG, Ericusspitze 2-4, 20457 Hamburg";
+                newServ.ServiceInvoiceRecipient = "Maersk Deutschland A/S & Co. KG on behalf of Sealand Europe A/S, Ericusspitze 2-4, 20457 Hamburg";
                 newServ.ServiceName = "SeaGo BHV";
                 newServ.MessageHeader = this._servMessage;
                 newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index a06b460f..a50170bb 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>7.3.0.2</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>7.3.0.3</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index c4e84226..9346a2e7 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -254,6 +254,11 @@ namespace ENI2.Excel
                 
                 for (int i = 1; i <= 25; i++)
                 {
+
+                    int? wasteType = (int?)reader.ReadCellAsDecimal("waste", string.Format("C{0}", i + 18));
+                    if (!wasteType.HasValue) continue;
+                    if (!WAS.WasteCodesInt.find(wasteType.Value)) continue;
+                        
                     if (!(was.GetSublistElementWithIdentifier(i.ToString()) is Waste waste))
                     {
                         waste = new Waste();
@@ -261,7 +266,8 @@ namespace ENI2.Excel
                         waste.WAS = was;
                         was.Waste.Add(waste);
                     }
-                    waste.WasteType = (int?)reader.ReadCellAsDecimal("waste", string.Format("C{0}", i + 18));
+
+                    waste.WasteType = wasteType;
                     waste.WasteDescription = reader.ReadCellAsText("waste", string.Format("D{0}", i + 18));
                     waste.WasteDisposalAmount_MTQ = reader.ReadCellAsDecimal("waste", string.Format("E{0}", i + 18));
                     waste.WasteCapacity_MTQ = reader.ReadCellAsDecimal("waste", string.Format("F{0}", i + 18));