diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index ecd2d829..e765c398 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>6</ApplicationRevision>
-    <ApplicationVersion>7.8.0.%2a</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>7.8.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index 8c065771..6453e2f7 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -35,7 +35,7 @@ namespace ENI2.EditControls
             };
 
             this.comboBoxInitialHIS.ItemsSource = comboDataSource;
-            this.comboBoxInitialHIS.SelectedIndex = 1;
+            this.comboBoxInitialHIS.SelectedIndex = 0;
 
             this.EnableOK(false);
             this.locodePoC.PropertyChanged += LocodePoC_PropertyChanged;
diff --git a/bsmd.database/LADG.cs b/bsmd.database/LADG.cs
index 61c133cc..f5267c9a 100644
--- a/bsmd.database/LADG.cs
+++ b/bsmd.database/LADG.cs
@@ -199,7 +199,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(1)) ladg.CargoHandlingType = reader.GetByte(1);
                 if (!reader.IsDBNull(2)) ladg.CargoCodeNST = reader.GetString(2);
                 if (!reader.IsDBNull(3)) ladg.CargoNumberOfItems = reader.GetInt32(3);
-                if (!reader.IsDBNull(4)) ladg.CargoGrossQuantity_TNE = (float) reader.GetDouble(4);
+                if (!reader.IsDBNull(4)) ladg.CargoGrossQuantity_TNE = reader.GetDouble(4);
                 if (!reader.IsDBNull(5)) ladg.PortOfLoading = reader.GetString(5);
                 if (!reader.IsDBNull(6)) ladg.PortOfDischarge = reader.GetString(6);
                 if (!reader.IsDBNull(7)) ladg.Identifier = reader.GetString(7);
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 564ff8ca..229436f1 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.8.0")]
+[assembly: AssemblyInformationalVersion("7.8.1")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 046c0723..eaba9da0 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.8.0.*")]
+[assembly: AssemblyVersion("7.8.1.*")]
 
diff --git a/bsmd.dbh/MessageController.cs b/bsmd.dbh/MessageController.cs
index cdd0278b..77226721 100644
--- a/bsmd.dbh/MessageController.cs
+++ b/bsmd.dbh/MessageController.cs
@@ -112,8 +112,9 @@ namespace bsmd.dbh
             {
                 _log.InfoFormat("sent {0}", sentFile);
                 string onlyFileName = Path.GetFileName(sentFile);
-                string moveTarget = Path.Combine(Properties.Settings.Default.OutgoingArchiveFolder, onlyFileName);
-                File.Move(sentFile, moveTarget);
+                string moveTarget = Path.Combine(Properties.Settings.Default.OutgoingArchiveFolder, onlyFileName);                
+                File.Copy(sentFile, moveTarget, true);
+                File.Delete(sentFile);
             }
 
             // receive files from remote host
@@ -128,13 +129,15 @@ namespace bsmd.dbh
                 {
                     _log.ErrorFormat("Error reading input file {0}", justFilename);
                     string errorPath = Path.Combine(Properties.Settings.Default.IncomingErrorFolder, justFilename);
-                    File.Move(inputFile, errorPath);
+                    File.Copy(inputFile, errorPath, true);
+                    File.Delete(inputFile);
                 }
                 else
                 {
                     _log.InfoFormat("Incoming file {0} processed", justFilename);
                     string archivePath = Path.Combine(Properties.Settings.Default.IncomingArchiveFolder, justFilename);
-                    File.Move(inputFile, archivePath);                    
+                    File.Copy(inputFile, archivePath, true);
+                    File.Delete(inputFile);
                 }
                 // remote Dateien löschen
                 bsmd.dakosy.SFtp.RemoveProcessedFile(Properties.Settings.Default.RemoteOutgoingFolder, Path.GetFileName(inputFile), Properties.Settings.Default.SFTPSessionName);
diff --git a/bsmd.dbh/RequestUtil.cs b/bsmd.dbh/RequestUtil.cs
index 5cb5db1e..4aeed901 100644
--- a/bsmd.dbh/RequestUtil.cs
+++ b/bsmd.dbh/RequestUtil.cs
@@ -1662,10 +1662,13 @@ namespace bsmd.dbh
                                     rwr.IdentificationNumber = was_rcpt.IdentificationNumber;
                                     rwr.PortReceptionFacilityName = was_rcpt.PortReceptionFacilityName;
                                     rwr.PortReceptionFacilityProviderName = was_rcpt.PortReceptionFacilityProviderName;
-                                    rwr.TreatmentFacilityProvider = new string[was_rcpt.TreatmentFacilityProvider.Count];
-                                    for (int j = 0; j < was_rcpt.TreatmentFacilityProvider.Count; j++)
+                                    if (was_rcpt.TreatmentFacilityProvider.Count > 0)
                                     {
-                                        rwr.TreatmentFacilityProvider[j] = was_rcpt.TreatmentFacilityProvider[j].TreatmentFacilityProviderName;
+                                        rwr.TreatmentFacilityProvider = new string[was_rcpt.TreatmentFacilityProvider.Count];
+                                        for (int j = 0; j < was_rcpt.TreatmentFacilityProvider.Count; j++)
+                                        {
+                                            rwr.TreatmentFacilityProvider[j] = was_rcpt.TreatmentFacilityProvider[j].TreatmentFacilityProviderName;
+                                        }
                                     }
                                     if (was_rcpt.WasteDeliveryDateFrom.HasValue)
                                         rwr.WasteDeliveryDateFrom = was_rcpt.WasteDeliveryDateFrom.Value.ToUTCSerializableDateTime();