diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index fa9d8fd0..1ae8c96c 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -764,7 +764,7 @@ namespace ENI2
                 NOA_NOD noanod = noanodMessage.Elements[0] as NOA_NOD;
                 if(sec.LastTenPortFacilitesCalled.Count > 0)
                 {
-                    if(!sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode.Equals(noanod.LastPort))
+                    if((sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode == null) || !sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode.Equals(noanod.LastPort))
                     {
                         MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "SEC last port doesn't match NOANOD last port", null, "Last port mismatch", null, "SEC");
                         mv.MessageGroupName = Properties.Resources.textOverview;
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 46365423..ba147625 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,7 +35,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.1.0.%2a</ApplicationVersion>
+    <ApplicationVersion>6.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -69,7 +69,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>ENI2_3_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\logo_schwarz.ico</ApplicationIcon>
@@ -90,7 +90,8 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>ENI2_3_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
index 18caf792..724dded6 100644
--- a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
@@ -402,6 +402,9 @@ namespace ENI2
                     closedDialog.Core.DefaultReportingPartyId = this.userEntity.Id;
                     DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(closedDialog.Core);
 
+                    // Meldeklassen für neuen Anlauf erzeugen
+                    bsmd.database.Util.CreateMessagesForCore(closedDialog.Core, null, userEntity);
+
                     // watchdog registrieren
                     this._dbWatchDog.Register(closedDialog.Core);                    
 
@@ -423,11 +426,8 @@ namespace ENI2
                     };
                     this.showIdDict.Add(closedDialog.Core.Id.Value, showIdDialog);
                     showIdDialog.Show();
-                    this.UpdateWaitIdLabel();
-
-                    // Meldeklassen für neuen Anlauf erzeugen
-                    bsmd.database.Util.CreateMessagesForCore(closedDialog.Core, null, userEntity);
-
+                    this.UpdateWaitIdLabel();                    
+                   
                 }
             };
             visitIdDialog.Show();            
diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
index 87f701c5..52bdac25 100644
--- a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
@@ -253,7 +253,7 @@ namespace ENI2
                 DataGrid grid = sender as DataGrid;
                 if (grid?.SelectedItems?.Count == 1)
                 {
-                    DataGridRow dgr = grid.ItemContainerGenerator.ContainerFromItem(grid.SelectedItem) as DataGridRow;
+                    // DataGridRow dgr = grid.ItemContainerGenerator.ContainerFromItem(grid.SelectedItem) as DataGridRow;
                     MessageCore selectedCore = grid.SelectedItem as MessageCore;
                     this.DisplayCore(selectedCore);
                 }
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 26b3e812..2f16bb41 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index 3a33306f..720dc281 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -252,7 +252,7 @@ namespace bsmd.database
         {
             MessageCore aMessageCore = new MessageCore();
             SqlCommand cmd = new SqlCommand();
-            if (limit.HasValue && (limit.Value > 0))
+            if (limit > 0)
                 aMessageCore.ResultLimit = limit;
             aMessageCore.PrepareLoadCommand(cmd, Message.LoadFilter.SEARCH_CORE_FILTERS, filters);
 
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 338edbce..b412bb36 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.1.0")]
+[assembly: AssemblyInformationalVersion("6.1.1")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2021 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 cdbfd50f..9d6d2f97 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.1.0.*")]
+[assembly: AssemblyVersion("6.1.1.*")]
 
diff --git a/nsw/Source/bsmd.database/Util.cs b/nsw/Source/bsmd.database/Util.cs
index c6f43d1e..921769d3 100644
--- a/nsw/Source/bsmd.database/Util.cs
+++ b/nsw/Source/bsmd.database/Util.cs
@@ -166,7 +166,7 @@ namespace bsmd.database
                     if (core.IsTransit && (notificationClass == Message.NotificationClass.VISIT)) continue;
                     if (!core.IsTransit && (notificationClass == Message.NotificationClass.TRANSIT)) continue;
 
-                    Message message = null;
+                    Message message;
 
                     if (!messageDict.ContainsKey(notificationClass))
                     {
@@ -185,7 +185,7 @@ namespace bsmd.database
                     }
 
                     // abgesehen von "Listen" für die Nachrichtenklassen auch untergeordnete Elemente erzeugen, falls nicht vorhanden!
-                    DatabaseEntity classElement = null;
+                    DatabaseEntity classElement;
                     if (!Message.IsListClass(notificationClass) && (message.Elements.Count == 0))
                     {                        
                         classElement = DBManager.CreateMessage(notificationClass);