diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 3c059acf..0435c8b9 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/SEC.cs b/nsw/Source/bsmd.database/SEC.cs
index 78621a0a..844c9b6e 100644
--- a/nsw/Source/bsmd.database/SEC.cs
+++ b/nsw/Source/bsmd.database/SEC.cs
@@ -409,7 +409,7 @@ namespace bsmd.database
                 if ((this.LastTenPortFacilitesCalled.Count == 0) || (this.LastTenPortFacilitesCalled.Count > 10))
                     errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "LastTenPortFacilitiesCalled", null, this.Title, null, this.Tablename));
 
-                if (!(this.ValidISSCOnBoard ?? false))
+                if (!(this.ApprovedSecurityPlanOnBoard ?? false))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "No valid security plan on board?", null, this.Title, null, this.Tablename));
 
                 if(this.KielCanalPassagePlanned ?? false)
diff --git a/nsw/Source/bsmd.database/STAT.cs b/nsw/Source/bsmd.database/STAT.cs
index a77c82d3..f0a67a55 100644
--- a/nsw/Source/bsmd.database/STAT.cs
+++ b/nsw/Source/bsmd.database/STAT.cs
@@ -320,7 +320,7 @@ namespace bsmd.database
             if (this.GrossTonnage.HasValue && ((this.GrossTonnage.Value < 50) || (this.GrossTonnage > 500000)))
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Gross tonnage valid?", null, this.Title, null, this.Tablename));
 
-            if((this.PortOfRegistry.Length > 1) && (this.Flag.Length == 2))
+            if((this.PortOfRegistry?.Length > 1) && (this.Flag?.Length == 2))
             {
                 if (!this.PortOfRegistry.Substring(0, 2).Equals(this.Flag))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Port of registration and flag do not match!", null, this.Title, null, this.Tablename));
diff --git a/nsw/Source/misc/db.sqlite b/nsw/Source/misc/db.sqlite
index 0693e66c..c3f258d3 100644
Binary files a/nsw/Source/misc/db.sqlite and b/nsw/Source/misc/db.sqlite differ