diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
index eb762ee..f332cf8 100644
--- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
@@ -5,6 +5,7 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraGrid.Views.Base
+Imports DevExpress.XtraEditors.Controls
 
 Public Class ClassWindreamDocGrid
     Public Shared SELECTED_DOC_PATH As String
@@ -298,8 +299,6 @@ Public Class ClassWindreamDocGrid
         Next
     End Sub
 
-
-
     Public Shared Sub detailView_CustomRowCellEdit(grvw As GridView, e As CustomRowCellEditEventArgs)
         Try
             If (e.Column.Name = "colVALUE") Then
@@ -332,30 +331,29 @@ Public Class ClassWindreamDocGrid
                 If typeId = 4 Then
                     Dim dateedit As New RepositoryItemDateEdit()
 
-                    ' Brauchen wir Zeitangaben in den Custom Fields?
-                    AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As DevExpress.XtraEditors.Controls.CustomDisplayTextEventArgs)
+                    dateedit.DisplayFormat.FormatType = FormatType.DateTime
+                    dateedit.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+                    dateedit.EditFormat.FormatType = FormatType.DateTime
+                    dateedit.EditFormat.FormatString = CURRENT_DATE_FORMAT
+                    dateedit.EditMask = CURRENT_DATE_FORMAT
+
+                    AddHandler dateedit.FormatEditValue, Sub(sender As Object, _e As ConvertEditValueEventArgs)
+                                                             _e.Handled = True
+                                                         End Sub
+
+                    AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As Controls.CustomDisplayTextEventArgs)
                                                                Dim parsedDate As DateTime
-
-                                                               If Not DateTime.TryParse(_e.Value, parsedDate) Then
-                                                                   Try
-                                                                       If _e.Value <> "" Then
-                                                                           parsedDate = DateTime.ParseExact(_e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo) '& " HH:MM:ss"
-                                                                           _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT) '& " HH:MM:ss")
-                                                                       End If
-
-                                                                   Catch ex As Exception
-                                                                       If LogErrorsOnly = False Then ClassLogger.Add("Error in parse-Date: " & ex.Message, False)
-                                                                   End Try
-
+                                                               Dim stringDate As String = _e.Value.ToString
+                                                               If stringDate.Trim() = String.Empty Then
+                                                                   _e.DisplayText = ""
                                                                Else
+                                                                   If Not DateTime.TryParse(stringDate, parsedDate) Then
+                                                                       parsedDate = DateTime.ParseExact(stringDate, CURRENT_DATE_FORMAT, Globalization.DateTimeFormatInfo.InvariantInfo)
+                                                                   End If
                                                                    _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT)
                                                                End If
-
-
-
                                                            End Sub
 
-
                     AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
                     e.RepositoryItem = dateedit
                 End If
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx
index 930b5bc..d210841 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@@ -543,7 +543,7 @@
     <value>GridControlMain</value>
   </data>
   <data name="&gt;&gt;GridControlMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControlMain.Parent" xml:space="preserve">
     <value>SplitContainerTop.Panel2</value>
@@ -713,7 +713,7 @@
     <value>SplitContainerTop</value>
   </data>
   <data name="&gt;&gt;SplitContainerTop.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;SplitContainerTop.Parent" xml:space="preserve">
     <value>SplitContainerMain.Panel1</value>
@@ -901,7 +901,7 @@
     <value>SplitContainerDetails</value>
   </data>
   <data name="&gt;&gt;SplitContainerDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;SplitContainerDetails.Parent" xml:space="preserve">
     <value>TabDetails</value>
@@ -1074,7 +1074,7 @@
     <value>TabDetails</value>
   </data>
   <data name="&gt;&gt;TabDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TabDetails.Parent" xml:space="preserve">
     <value>TCDetails</value>
@@ -1110,7 +1110,7 @@
     <value>GridControlPos</value>
   </data>
   <data name="&gt;&gt;GridControlPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControlPos.Parent" xml:space="preserve">
     <value>Panel1</value>
@@ -1388,7 +1388,7 @@
     <value>TabPos</value>
   </data>
   <data name="&gt;&gt;TabPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TabPos.Parent" xml:space="preserve">
     <value>TCDetails</value>
@@ -1450,7 +1450,7 @@
     <value>GridControlDocSearch</value>
   </data>
   <data name="&gt;&gt;GridControlDocSearch.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControlDocSearch.Parent" xml:space="preserve">
     <value>TabWindream</value>
@@ -1552,7 +1552,7 @@
     <value>TabWindream</value>
   </data>
   <data name="&gt;&gt;TabWindream.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TabWindream.Parent" xml:space="preserve">
     <value>TCDetails</value>
@@ -1983,7 +1983,7 @@
     <value>TabFollowUp</value>
   </data>
   <data name="&gt;&gt;TabFollowUp.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TabFollowUp.Parent" xml:space="preserve">
     <value>TCDetails</value>
@@ -2094,7 +2094,7 @@
     <value>GridControl1</value>
   </data>
   <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
     <value>TabPageVariant</value>
@@ -2166,7 +2166,7 @@
     <value>TabPageVariant</value>
   </data>
   <data name="&gt;&gt;TabPageVariant.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TabPageVariant.Parent" xml:space="preserve">
     <value>TCDetails</value>
@@ -2178,7 +2178,7 @@
     <value>TCDetails</value>
   </data>
   <data name="&gt;&gt;TCDetails.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TCDetails.Parent" xml:space="preserve">
     <value>SplitContainerMain.Panel2</value>
@@ -2202,7 +2202,7 @@
     <value>SplitContainerMain</value>
   </data>
   <data name="&gt;&gt;SplitContainerMain.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;SplitContainerMain.Parent" xml:space="preserve">
     <value>SplitContainerFORM.Panel2</value>
@@ -2235,7 +2235,7 @@
     <value>SplitContainerFORM</value>
   </data>
   <data name="&gt;&gt;SplitContainerFORM.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;SplitContainerFORM.Parent" xml:space="preserve">
     <value>$this</value>
@@ -2508,7 +2508,7 @@
     <value>NavPane</value>
   </data>
   <data name="&gt;&gt;NavPane.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;NavPane.Parent" xml:space="preserve">
     <value>$this</value>
@@ -2597,11 +2597,11 @@
   <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>444, 17</value>
   </metadata>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFtEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
-        MTUuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
+        MTYuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iODhkMTc1NGQ3MDBlNDlhBQEAAAAo
         RGV2RXhwcmVzcy5VdGlscy5JbWFnZUNvbGxlY3Rpb25TdHJlYW1lcgAAAAACAAAACw==
 </value>
   </data>
@@ -3346,19 +3346,19 @@
     <value>grvwGrid</value>
   </data>
   <data name="&gt;&gt;grvwGrid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;grvwCarousel.Name" xml:space="preserve">
     <value>grvwCarousel</value>
   </data>
   <data name="&gt;&gt;grvwCarousel.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Layout.LayoutView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;grvwTiles.Name" xml:space="preserve">
     <value>grvwTiles</value>
   </data>
   <data name="&gt;&gt;grvwTiles.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;tslbldisplayRecords.Name" xml:space="preserve">
     <value>tslbldisplayRecords</value>
@@ -3526,7 +3526,7 @@
     <value>grvwGridPos</value>
   </data>
   <data name="&gt;&gt;grvwGridPos.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
     <value>BindingNavigatorAddNewItem</value>
@@ -3628,7 +3628,7 @@
     <value>GridViewDoc_Search</value>
   </data>
   <data name="&gt;&gt;GridViewDoc_Search.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;tslblWindreamView.Name" xml:space="preserve">
     <value>tslblWindreamView</value>
@@ -3694,43 +3694,43 @@
     <value>GridViewVariants</value>
   </data>
   <data name="&gt;&gt;GridViewVariants.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
     <value>GridColumn1</value>
   </data>
   <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colREASON_CODE.Name" xml:space="preserve">
     <value>colREASON_CODE</value>
   </data>
   <data name="&gt;&gt;colREASON_CODE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colCOMMENT.Name" xml:space="preserve">
     <value>colCOMMENT</value>
   </data>
   <data name="&gt;&gt;colCOMMENT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
     <value>colADDED_WHO</value>
   </data>
   <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
     <value>colADDED_WHEN</value>
   </data>
   <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colRECORD_ID.Name" xml:space="preserve">
     <value>colRECORD_ID</value>
   </data>
   <data name="&gt;&gt;colRECORD_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;tslblVariantsCount.Name" xml:space="preserve">
     <value>tslblVariantsCount</value>
@@ -3922,19 +3922,19 @@
     <value>TileNavCategory1</value>
   </data>
   <data name="&gt;&gt;TileNavCategory1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Navigation.TileNavCategory, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Navigation.TileNavCategory, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;NavButtonHome.Name" xml:space="preserve">
     <value>NavButtonHome</value>
   </data>
   <data name="&gt;&gt;NavButtonHome.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;NavButtonRefresh.Name" xml:space="preserve">
     <value>NavButtonRefresh</value>
   </data>
   <data name="&gt;&gt;NavButtonRefresh.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;tsslblStatus.Name" xml:space="preserve">
     <value>tsslblStatus</value>
@@ -3982,7 +3982,7 @@
     <value>ImageCollection1</value>
   </data>
   <data name="&gt;&gt;ImageCollection1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;ttToolTip.Name" xml:space="preserve">
     <value>ttToolTip</value>
@@ -4012,7 +4012,7 @@
     <value>ToolTipController</value>
   </data>
   <data name="&gt;&gt;ToolTipController.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TBPMO_RECORD_VARIANTTableAdapter.Name" xml:space="preserve">
     <value>TBPMO_RECORD_VARIANTTableAdapter</value>
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index bec0dc2..2421543 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -3698,7 +3698,13 @@ Public Class frmConstructor_Main
             Dim value As DateTime = DatePicker.EditValue
 
             Dim oldValue As Date
-            Dim validDate As Boolean = Date.TryParse(DatePicker.OldEditValue, oldValue)
+            Dim validDate As Boolean = False
+
+            Try
+                validDate = Date.TryParse(DatePicker.OldEditValue, oldValue)
+            Catch ex As Exception
+                oldValue = Date.MinValue
+            End Try
 
             If Not validDate Then
                 oldValue = Date.MinValue