diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 4964de78..4aaccf82 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -34,7 +34,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>6.0.5.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 8136867d..da12c551 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.POService/misc/Sammelrechnung.xlsx b/nsw/Source/bsmd.POService/misc/Sammelrechnung.xlsx
new file mode 100644
index 00000000..cf77f287
Binary files /dev/null and b/nsw/Source/bsmd.POService/misc/Sammelrechnung.xlsx differ
diff --git a/nsw/Source/bsmd.POService/misc/Sammelrechnung_SEAGO_KW_08.xlsx b/nsw/Source/bsmd.POService/misc/Sammelrechnung_SEAGO_KW_08.xlsx
new file mode 100644
index 00000000..1d0d1b50
Binary files /dev/null and b/nsw/Source/bsmd.POService/misc/Sammelrechnung_SEAGO_KW_08.xlsx differ
diff --git a/nsw/Source/bsmd.POService/misc/Sammelrechnung_Test.xlsx b/nsw/Source/bsmd.POService/misc/Sammelrechnung_Test.xlsx
new file mode 100644
index 00000000..9b473a78
Binary files /dev/null and b/nsw/Source/bsmd.POService/misc/Sammelrechnung_Test.xlsx differ
diff --git a/nsw/Source/bsmd.ReportGenerator/ReportService.cs b/nsw/Source/bsmd.ReportGenerator/ReportService.cs
index 1278ee89..e6c91248 100644
--- a/nsw/Source/bsmd.ReportGenerator/ReportService.cs
+++ b/nsw/Source/bsmd.ReportGenerator/ReportService.cs
@@ -21,9 +21,9 @@ namespace bsmd.ReportGenerator
     {
 
         private Timer _timer;
-        private object _timerlock = new object();
+        private readonly object _timerlock = new object();
         private bool processRunning = false;
-        private ILog _log = LogManager.GetLogger(typeof(ReportService));
+        private readonly ILog _log = LogManager.GetLogger(typeof(ReportService));
 
         public ReportService()
         {
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 21b363ad..7e663349 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.0.5")]
+[assembly: AssemblyInformationalVersion("6.0.6")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2020 schick Informatik")]
 [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 78b0b776..82d8572a 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("6.0.5.*")]
+[assembly: AssemblyVersion("6.0.6.*")]
 
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index 337f5ed7..29fe3916 100644
--- a/nsw/Source/bsmd.hisnord/Request.cs
+++ b/nsw/Source/bsmd.hisnord/Request.cs
@@ -1356,7 +1356,7 @@ namespace bsmd.hisnord
                                     hn_pas.Passenger[i].PassengerIdentityDocumentExpiryDateSpecified = pas.PassengerIdentityDocumentExpiryDate.HasValue;
                                     if (pas.PassengerIdentityDocumentExpiryDate.HasValue)
                                         hn_pas.Passenger[i].PassengerIdentityDocumentExpiryDate = pas.PassengerIdentityDocumentExpiryDate.Value;
-                                    if(pas.PassengerIdentityDocumentIssuingState.Trim().Length == 2)
+                                    if(pas.PassengerIdentityDocumentIssuingState?.Trim().Length == 2)
                                         hn_pas.Passenger[i].PassengerIdentityDocumentIssuingState = pas.PassengerIdentityDocumentIssuingState;
                                 }
 
@@ -1404,7 +1404,7 @@ namespace bsmd.hisnord
                                     hn_crew.CrewMember[i].CrewmemberIdentityDocumentExpiryDateSpecified = crew.CrewMemberIdentityDocumentExpiryDate.HasValue;
                                     if (crew.CrewMemberIdentityDocumentExpiryDate.HasValue)
                                         hn_crew.CrewMember[i].CrewmemberIdentityDocumentExpiryDate = crew.CrewMemberIdentityDocumentExpiryDate.Value;
-                                    if(crew.CrewMemberIdentityDocumentIssuingState.Trim().Length == 2)
+                                    if(crew.CrewMemberIdentityDocumentIssuingState?.Trim().Length == 2)
                                         hn_crew.CrewMember[i].CrewMemberIdentityDocumentIssuingState = crew.CrewMemberIdentityDocumentIssuingState;
                                 }
 
diff --git a/nsw/Source/bsmd.hisnord/transmitter.cs b/nsw/Source/bsmd.hisnord/transmitter.cs
index 95362d4a..4abb8800 100644
--- a/nsw/Source/bsmd.hisnord/transmitter.cs
+++ b/nsw/Source/bsmd.hisnord/transmitter.cs
@@ -90,6 +90,8 @@ namespace bsmd.hisnord
                     {
                         transmitterProcess.Kill();
                         _log.Info("Transmitter killed");
+                        if (useTest) processTestId = null;
+                        else processId = null;
                     }
                     catch (Exception e)
                     {