diff --git a/ENI2/Controls/EditWindowBase.cs b/ENI2/Controls/EditWindowBase.cs
index 0f287dcb..4512d3c1 100644
--- a/ENI2/Controls/EditWindowBase.cs
+++ b/ENI2/Controls/EditWindowBase.cs
@@ -109,6 +109,7 @@ namespace ENI2.Controls
                     thePicker.Value = new DateTime(year, month, day, hour, minute, 0);
                 }
                 catch (FormatException) { }
+                catch (ArgumentOutOfRangeException) { thePicker.Value = DateTime.Now; }
             }
         }
 
@@ -121,10 +122,11 @@ namespace ENI2.Controls
                     string timevalText = rd.Match(thePicker.Text).Captures[0].Value;
                     int day = Int32.Parse(timevalText.Substring(0, 2));
                     int month = Int32.Parse(timevalText.Substring(2, 2));
-                    int year = Int32.Parse(timevalText.Substring(4, 4));                    
+                    int year = Int32.Parse(timevalText.Substring(4, 4));
                     thePicker.SelectedDate = new DateTime(year, month, day, 0, 0, 0);
                 }
                 catch (FormatException) { }
+                catch (ArgumentOutOfRangeException) { thePicker.SelectedDate = DateTime.Now; }
             }
         }
 
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 7e7fdc1a..d04528a1 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
-    <ManifestCertificateThumbprint>94D98790E3B6C4CC9F4B57C8FD305E3225894DF8</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>F2C2D0164244EC89955EF50201EE24C2A300FF0B</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>