diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 952ee5e8..09da670d 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>16</ApplicationRevision>
-    <ApplicationVersion>7.0.0.16</ApplicationVersion>
+    <ApplicationRevision>17</ApplicationRevision>
+    <ApplicationVersion>7.0.0.17</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index ef11842a..a681508c 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -1179,19 +1179,7 @@ namespace ENI2.Excel
                     was.Waste.Add(waste);
                 }
 
-                waste.WasteType = (int?) reader.ReadNumber(wasteCode);
-                // falls ein altes Sheet eingelesen wird, diese Felder automatisch mappen
-                if (waste.WasteType == 1100) waste.WasteType = 102;
-                if (waste.WasteType == 1200) waste.WasteType = 101;
-                if (waste.WasteType == 1300) waste.WasteType = 999;
-                if (waste.WasteType == 2100) waste.WasteType = 502;
-                if (waste.WasteType == 2200) waste.WasteType = 501;
-                if (waste.WasteType == 2300) waste.WasteType = 503;
-                if (waste.WasteType == 2311) waste.WasteType = 504;
-                if (waste.WasteType == 2308) waste.WasteType = 505;
-                if (waste.WasteType == 2313) waste.WasteType = 506;
-                if (waste.WasteType == 2309) waste.WasteType = 507;
-                if (waste.WasteType == 3000) waste.WasteType = 401;                
+                waste.WasteType = (int?) reader.ReadNumber(wasteCode);                             
 
                 // Waste description Spezialfälle für DK                
                 waste.WasteDescription = reader.ReadText(wasteDescription);
@@ -1225,7 +1213,20 @@ namespace ENI2.Excel
                     _log.DebugFormat("DK: Changing Waste code {0} to 2300 for line {1}", waste.WasteType, i);
                     waste.WasteType = 2300;
                 }
-                
+
+                // falls ein altes Sheet eingelesen wird, diese Felder automatisch mappen
+                if (waste.WasteType == 1100) waste.WasteType = 102;
+                if (waste.WasteType == 1200) waste.WasteType = 101;
+                if (waste.WasteType == 1300) waste.WasteType = 999;
+                if (waste.WasteType == 2100) waste.WasteType = 502;
+                if (waste.WasteType == 2200) waste.WasteType = 501;
+                if (waste.WasteType == 2300) waste.WasteType = 503;
+                if (waste.WasteType == 2311) waste.WasteType = 504;
+                if (waste.WasteType == 2308) waste.WasteType = 505;
+                if (waste.WasteType == 2313) waste.WasteType = 506;
+                if (waste.WasteType == 2309) waste.WasteType = 507;
+                if (waste.WasteType == 3000) waste.WasteType = 401;
+
                 waste.WasteDisposalAmount_MTQ = reader.ReadNumberDefaultZero(wasteAmount);
                 waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity);
                 waste.WasteAmountRetained_MTQ = reader.ReadNumberDefaultZero(wasteRetained);
@@ -1239,7 +1240,7 @@ namespace ENI2.Excel
 
                 waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);
 
-                if (!waste.WasteType.HasValue)
+                if (!waste.WasteType.HasValue || (waste.WasteType > 999))
                 {
                     was.Waste.Remove(waste);
                 }