diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 78c056f7..85954c66 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/Zugang_BSMD-Server-Bux_DanielSchick_20150222.txt b/Zugang_BSMD-Server-Bux_DanielSchick_20150222.txt
index 717389af..2f754d34 100644
--- a/Zugang_BSMD-Server-Bux_DanielSchick_20150222.txt
+++ b/Zugang_BSMD-Server-Bux_DanielSchick_20150222.txt
@@ -17,8 +17,29 @@ SMNSW01 [NSW-Server], 192.168.2.4, vorher: www.schiffsmelder.com:41624
 
 SMSPLASH01 [Dashface-Server], 192.168.2.5, vorher: www.schiffsmelder.com:41625
 
+SMAIS01 [AIS-Server], 192.168.2.11
+
+SMDEV01 [Devel-System], 192.168.2.6
+
 für alle Server:
 User: Administrator
 PW: $chegVAN99!
 hallo12345
 
+daniel.schick#
+yycYYC321
+
+
+daniel.schick#
+Winter2015
+
+bscw,dkz.it.de:
+mippel 
+$jj$.ASD12
+
+Gast-WLAN:
+AksSD231.23ddf
+
+Test-Email Konto für Excel-Versand / Import:
+excel@textbausteine.net
+3kjasWss.;.
diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
index 8d113f43..6c5c49b2 100644
--- a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
+++ b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
@@ -329,9 +329,21 @@ namespace bsmd.ExcelReadService
 
                     // TODO: weitere varianten ausprobieren
                     if (date != null)
-                        this.HighlightLookup(lookup, ReadState.OK);
+                    {
+                        if ((date.Value < new DateTime(1900, 1, 1)) || (date.Value > new DateTime(2030, 1, 1)))
+                        {
+                            date = null;
+                            this.HighlightLookup(lookup, ReadState.WARN);
+                        }
+                        else
+                        {
+                            this.HighlightLookup(lookup, ReadState.OK);
+                        }
+                    }
                     else
-                        this.HighlightLookup(lookup, ReadState.WARN);
+                    {
+                        this.HighlightLookup(lookup, ReadState.FAIL);
+                    }
                 }
 
                 return date;
@@ -468,7 +480,7 @@ namespace bsmd.ExcelReadService
                     }
                     else
                     {
-                        this.HighlightLookup(lookup, ReadState.WARN);
+                        this.HighlightLookup(lookup, ReadState.FAIL);
                     }
                 }                
             }
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index 7239b527..94910fb3 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -329,6 +329,9 @@ namespace bsmd.ExcelReadService
                     stat.PortOfRegistry = LocodeDB.LocodeFromCity(stat.PortOfRegistry, stat.Flag);
             }
 
+            if (!stat.Flag.IsNullOrEmpty() && (stat.Flag.Length > 2))
+                reader.HighlightLookup("STAT.Flag", ExcelReader.ReadState.FAIL);
+
             string transportMode = reader.ReadText("STAT.TransportMode");
             if(transportMode != null)
             {
@@ -994,6 +997,8 @@ namespace bsmd.ExcelReadService
                     crew.CrewMemberGender = reader.ReadGender(crewGender);
                     crew.CrewMemberDuty = reader.ReadText(crewDuty);
                     crew.CrewMemberNationality = reader.ReadText(crewNationality);
+                    if (!crew.CrewMemberNationality.IsNullOrEmpty() && (crew.CrewMemberNationality.Length > 2))
+                        reader.HighlightLookup(crewNationality, ExcelReader.ReadState.FAIL);
                     crew.CrewMemberPlaceOfBirth = reader.ReadText(crewPlaceOfBirth);
                     crew.CrewMemberDateOfBirth = reader.ReadDate(crewDateOfBirth);
                     crew.CrewMemberIdentityDocumentType = reader.ReadIdentityDocumentType(crewIdentDocType);
@@ -1042,6 +1047,8 @@ namespace bsmd.ExcelReadService
                     pas.PassengerFirstName = reader.ReadText(pasFirstName);
                     pas.PassengerGender = reader.ReadGender(pasGender);
                     pas.PassengerNationality = reader.ReadText(pasNationality);
+                    if (!pas.PassengerNationality.IsNullOrEmpty() && pas.PassengerNationality.Length > 2)
+                        reader.HighlightLookup(pasNationality, ExcelReader.ReadState.FAIL);
                     // TODO: Nicht klar ob hier LOCODEs kommen oder nicht
                     pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation);
                     pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation);
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 2984595d..4646382e 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.2.22")]
+[assembly: AssemblyInformationalVersion("3.2.25")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
 [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 d22ccb13..ca249f28 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("3.2.22.*")]
+[assembly: AssemblyVersion("3.2.25.*")]