diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 9b5affc2..6b37bc52 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -37,7 +37,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.9.1.0</ApplicationVersion>
+    <ApplicationVersion>6.9.2.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Report/ReportDocument.cs b/ENI2/Report/ReportDocument.cs
index 12ca62b6..af15e803 100644
--- a/ENI2/Report/ReportDocument.cs
+++ b/ENI2/Report/ReportDocument.cs
@@ -888,7 +888,7 @@ namespace ENI2.Report
 
         private static void SetPoCLast30Days(PortOfCallLast30Days portOfCallLast30Days, Row row)
         {
-            row.Cells[0].AddParagraph(portOfCallLast30Days.Identifier);            
+            row.Cells[0].AddParagraph(portOfCallLast30Days.Identifier ?? "");            
             
             row.Cells[1].AddParagraph(LocodeDB.LocationNameFromLocode(portOfCallLast30Days.PortOfCallLast30DaysLocode) ?? "");
             row.Cells[2].AddParagraph(portOfCallLast30Days.PortOfCallLast30DaysDateOfDeparture.HasValue ?
diff --git a/ENI2/Report/ReportManager.cs b/ENI2/Report/ReportManager.cs
index f2187eb0..31b9d88b 100644
--- a/ENI2/Report/ReportManager.cs
+++ b/ENI2/Report/ReportManager.cs
@@ -35,6 +35,7 @@ namespace ENI2.Report
 
             foreach (Message aMessage in messages)
             {
+                if (aMessage.Elements.Count == 0) continue; // don't output empty list classes
                 if (notificationClasses.Contains(aMessage.MessageNotificationClass))
                 {                    
                     reportMessages.Add(aMessage);
diff --git a/bsmd.database/Message.cs b/bsmd.database/Message.cs
index a86769df..834c511f 100644
--- a/bsmd.database/Message.cs
+++ b/bsmd.database/Message.cs
@@ -738,9 +738,7 @@ namespace bsmd.database
                 }
                 else
                 {
-                    if (this.MessageNotificationClass == NotificationClass.VISIT) return "VISIT";
-                    if (this.MessageNotificationClass == NotificationClass.TRANSIT) return "TRANSIT";
-                    return "unknown";
+                    return MessageNotificationClassDisplay;                    
                 }                
             }
         }
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index ad2d76b0..39ec5bc4 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("6.9.0")]
+[assembly: AssemblyInformationalVersion("6.9.2")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2021 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 d52adb8b..a73df311 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.9.0.*")]
+[assembly: AssemblyVersion("6.9.2.*")]