diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
index 5ee1a9e..aa39564 100644
--- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
@@ -337,9 +337,9 @@ Public Class ClassControlCommandsUI
             If CONTROL_ID <> -1 Then
                 CONTROL_VALUE = GetControlValue(ctrl)
             End If
-            If TypeName(ctrl).ToString = "DateEdit" Then
-                CONTROL_VALUE = CDate(CONTROL_VALUE)
-            End If
+            'If TypeName(ctrl).ToString = "DateEdit" Then
+            '    CONTROL_VALUE = CDate(CONTROL_VALUE)
+            'End If
             'If CONTROL_ID = 489 Then
             '    Console.WriteLine(TypeName(ctrl))
             'End If
@@ -514,7 +514,13 @@ Public Class ClassControlCommandsUI
             Case "RadioButton"
                 Return DirectCast(ctrl, RadioButton).Checked.ToString()
             Case "DateEdit"
-                Return DirectCast(ctrl, DevExpress.XtraEditors.DateEdit).DateTime.ToString("yyyy-MM-dd")
+                Dim Value = DirectCast(ctrl, DevExpress.XtraEditors.DateEdit).EditValue
+
+                If IsDBNull(Value) Then
+                    Return ""
+                Else
+                    Return DirectCast(ctrl, DevExpress.XtraEditors.DateEdit).DateTime.ToString("yyyy-MM-dd")
+                End If
             Case "PictureBox"
                 'Return "PictureBox" 'Es ist egal was für ein String hier zurückgegeben wird, hauptsache nicht Nothing
             Case "CheckedListBoxControl"
@@ -607,22 +613,19 @@ Public Class ClassControlCommandsUI
         Try
             Dim AddedWho = Environment.UserName
             Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
-            Try
-                Select Case FORMAT_TYPE
-                    Case "Currency"
-                        If Not Value = String.Empty Then
-                            Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
-                        End If
 
-                    Case "Decimal"
-                        If Not Value = String.Empty Then
-                            Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer)
-                        End If
+            Select Case FORMAT_TYPE
+                Case "Currency"
+                    If Not Value = String.Empty Then
+                        Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
+                    End If
 
-                End Select
-            Catch ex As Exception
-                ClassLogger.Add("Unerwarteter Fehler in Insert ConvertValue to Format'" & FORMAT_TYPE & "': " & ex.Message, True)
-            End Try
+                Case "Decimal"
+                    If Not Value = String.Empty Then
+                        Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer)
+                    End If
+
+            End Select
 
             Using conn As New SqlClient.SqlConnection(MyConnectionString)
                 Dim cmd As New SqlClient.SqlCommand("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES (@CONTROL_ID, @RECORD_ID, @VALUE, @ADDED_WHO)", conn)
@@ -648,19 +651,15 @@ Public Class ClassControlCommandsUI
         Try
             Dim CHANGED_WHO = Environment.UserName
             Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
-            Try
-                If Not Value = String.Empty Then
-                    Select Case FORMAT_TYPE
-                        Case "Currency"
-                            Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
-                        Case "Decimal"
-                            Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer)
-                    End Select
-                End If
 
-            Catch ex As Exception
-                ClassLogger.Add("Unerwarteter Fehler in Update ConvertValue to Format'" & FORMAT_TYPE & "': " & ex.Message, True)
-            End Try
+            If Not Value = String.Empty Then
+                Select Case FORMAT_TYPE
+                    Case "Currency"
+                        Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
+                    Case "Decimal"
+                        Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer)
+                End Select
+            End If
 
             Using conn As New SqlClient.SqlConnection(MyConnectionString)
                 Dim cmd As New SqlClient.SqlCommand("UPDATE TBPMO_CONTROL_VALUE SET VALUE = @VALUE, CHANGED_WHO = @CHANGED_WHO WHERE CONTROL_ID = @CONTROL_ID AND RECORD_ID = @RECORD_ID", conn)
@@ -674,9 +673,6 @@ Public Class ClassControlCommandsUI
                 Return True
             End Using
 
-            'Dim SQL As String = "UPDATE TBPMO_CONTROL_VALUE SET VALUE = '" & Value & "', CHANGED_WHO = '" & CHANGED_WHO & "' WHERE CONTROL_ID = " & ControlID & " AND RECORD_ID = " & RecordID
-            'Return ClassDatabase.Execute_non_Query(Sql, True)
-
         Catch ex As Exception
             ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True)
             Return False