diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs
index 73f42df3..53217854 100644
--- a/nsw/Source/SendNSWMessageService/NSWSendService.cs
+++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs
@@ -41,8 +41,7 @@ namespace SendNSWMessageService
             string version = fvi.FileVersion;
 
             this.EventLog.WriteEntry("NSW Send Service started", EventLogEntryType.Information);
-            _log.InfoFormat("NSW Send Service started. v.{0}", version);
-
+            _log.InfoFormat("NSW Send Service started. v.{0}", version);            
             this.DoOnce();
         }
 
diff --git a/nsw/Source/bsmd.database/HAZ.cs b/nsw/Source/bsmd.database/HAZ.cs
index 55eb4322..ed87b05f 100644
--- a/nsw/Source/bsmd.database/HAZ.cs
+++ b/nsw/Source/bsmd.database/HAZ.cs
@@ -288,9 +288,11 @@ namespace bsmd.database
         {
             if (this.GetValidationBlock() == ValidationBlock.BLOCK2)
             {
+                /*
                 if ((this.IMDGPositions.Count == 0) && (this.IBCPositions.Count == 0) && (this.IGCPositions.Count == 0) &&
                     (this.IMSBCPositions.Count == 0) && (this.MARPOLPositions.Count == 0))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V805, "At least one DPG item has to be provided!", null));
+                */
 
                 foreach (IMDGPosition imdg in this.IMDGPositions)
                 {
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index e349218c..deafbff3 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("2.4.12")]
+[assembly: AssemblyInformationalVersion("2.4.13")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2015 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index dcb511f8..57267874 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.4.12.*")]
+[assembly: AssemblyVersion("2.4.13.*")]
 
diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs
index f9cb7fa0..c93575f4 100644
--- a/nsw/Source/bsmd.dbh/Request.cs
+++ b/nsw/Source/bsmd.dbh/Request.cs
@@ -661,10 +661,13 @@ namespace bsmd.dbh
                             List<ItemsChoiceType2> choiceTypes2 = new List<ItemsChoiceType2>();                            
                             
                             choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyage);
-                            mdhItems.Add(mdh.NonAccidentalDeathsDuringVoyage ?? false ? RootMDHNonAccidentialDeathsDuringVoyage.Y : RootMDHNonAccidentialDeathsDuringVoyage.N);
+                            mdhItems.Add((mdh.NonAccidentalDeathsDuringVoyage ?? false) ? RootMDHNonAccidentialDeathsDuringVoyage.Y : RootMDHNonAccidentialDeathsDuringVoyage.N);
 
-                            choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyageCount);                            
-                            mdhItems.Add(mdh.NonAccidentalDeathsDuringVoyageCount ?? 0);
+                            if (mdh.NonAccidentalDeathsDuringVoyage ?? false)
+                            {
+                                choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyageCount);
+                                mdhItems.Add(mdh.NonAccidentalDeathsDuringVoyageCount ?? 0);
+                            }
 
                             choiceTypes2.Add(ItemsChoiceType2.SuspisionInfectiousNature);
                             mdhItems.Add(mdh.SuspisionInfectiousNature ?? false ? RootMDHSuspisionInfectiousNature.Y : RootMDHSuspisionInfectiousNature.N);
@@ -672,8 +675,11 @@ namespace bsmd.dbh
                             choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersonsHigherThanExpected);
                             mdhItems.Add(mdh.NumberOfIllPersonsHigherThanExpected ?? false ? RootMDHNumberOfIllPersonsHigherThanExpected.Y : RootMDHNumberOfIllPersonsHigherThanExpected.N);
 
-                            choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersons);                            
-                            mdhItems.Add(mdh.NumberOfIllPersons ?? 0);
+                            if (mdh.NumberOfIllPersonsHigherThanExpected ?? false)
+                            {
+                                choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersons);
+                                mdhItems.Add(mdh.NumberOfIllPersons ?? 0);
+                            }
 
                             choiceTypes2.Add(ItemsChoiceType2.SickPersonsOnBoard);
                             mdhItems.Add(mdh.SickPersonsOnBoard ?? false ? RootMDHSickPersonsOnBoard.Y : RootMDHSickPersonsOnBoard.N);
@@ -1406,6 +1412,7 @@ namespace bsmd.dbh
                     }
                 }
 
+                _log.InfoFormat("Send Url: {0}", client.Url);
 
                 string result = client.Root(
                     version,
diff --git a/nsw/Source/bsmd.herberg.FormService/XtraLogic.cs b/nsw/Source/bsmd.herberg.FormService/XtraLogic.cs
index 00c57b5c..5d05ad86 100644
--- a/nsw/Source/bsmd.herberg.FormService/XtraLogic.cs
+++ b/nsw/Source/bsmd.herberg.FormService/XtraLogic.cs
@@ -68,10 +68,7 @@ namespace bsmd.herberg.FormService
                 core.Portname = "NOK";
                 core.PoC = "ZZNOK";
                 core.ETA = core.ETAKielCanal;
-            }
-            
-
+            }           
         }
-
     }
 }