diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index 332aea21..abc9b0c9 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -2387,9 +2387,9 @@ namespace bsmd.ExcelReadService
                     pas.PassengerGender = reader.ReadGender(pasGender);
                     pas.PassengerNationality = reader.ReadNationality(pasNationality);					
                     // TODO: Nicht klar ob hier LOCODEs kommen oder nicht
-                    pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation);
+                    pas.PassengerPortOfEmbarkation = reader.ReadLoCode(pasEmbarkation);
                     reader.Conf.ConfirmText(pasEmbarkation, pas.PassengerPortOfEmbarkation, pas.PassengerPortOfEmbarkation.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
-                    pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation);
+                    pas.PassengerPortOfDisembarkation = reader.ReadLoCode(pasDebarkation);
                     reader.Conf.ConfirmText(pasDebarkation, pas.PassengerPortOfDisembarkation, pas.PassengerPortOfDisembarkation.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
                     pas.PassengerInTransit = reader.ReadBoolean(pasTransit);
                     pas.PassengerPlaceOfBirth = reader.ReadText(pasPlaceOfBirth);
diff --git a/nsw/Source/bsmd.database/WAS.cs b/nsw/Source/bsmd.database/WAS.cs
index b5529f20..42af6299 100644
--- a/nsw/Source/bsmd.database/WAS.cs
+++ b/nsw/Source/bsmd.database/WAS.cs
@@ -438,6 +438,18 @@ namespace bsmd.database
                     if (!foundWaste.WasteDisposedAtLastPort_MTQ.HasValue) foundWaste.WasteDisposedAtLastPort_MTQ = 0;
                 }
             }
+
+            // falls Zeile 15 oder mehr vorhanden war / ist werden dort auch noch default Werte ergänzt
+            foreach(Waste foundWaste in this.Waste)
+            {
+                if (!foundWaste.WasteAmountGeneratedTillNextPort_MTQ.HasValue) foundWaste.WasteAmountGeneratedTillNextPort_MTQ = 0;
+                if (!foundWaste.WasteAmountRetained_MTQ.HasValue) foundWaste.WasteAmountRetained_MTQ = 0;
+                if (!foundWaste.WasteCapacity_MTQ.HasValue) foundWaste.WasteCapacity_MTQ = 0;
+                if ((foundWaste.WasteType == 1300) && foundWaste.WasteDescription.IsNullOrEmpty()) foundWaste.WasteDescription = "-";
+                if (!foundWaste.WasteDisposalAmount_MTQ.HasValue) foundWaste.WasteDisposalAmount_MTQ = 0;
+                if (foundWaste.WasteDisposalPort.IsNullOrEmpty()) foundWaste.WasteDisposalPort = "ZZUKN";
+                if (!foundWaste.WasteDisposedAtLastPort_MTQ.HasValue) foundWaste.WasteDisposedAtLastPort_MTQ = 0;
+            }
         }
 
         #endregion