diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index eae8e82..d1f2643 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -653,6 +653,10 @@ Public Class ClassControlCreator
         AddHandler oView.ShowingEditor, AddressOf View_ShowingEditor
         AddHandler oView.ShownEditor, AddressOf View_ShownEditor
         AddHandler oView.ValidateRow, AddressOf View_ValidateRow
+        AddHandler oControl.LostFocus, Sub(sender As GridControl, e As EventArgs)
+                                           Dim oView2 As GridView = sender.FocusedView
+                                           oView2.UpdateCurrentRow()
+                                       End Sub
 
         Return oControl
     End Function
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index b464384..8590259 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -2203,7 +2203,6 @@ Public Class frmValidator
                 oBIT = 1
             End If
             Dim oSQL = $"EXEC PRPM_GET_NEXT_DOC_INFO {CURRENT_ProfilGUID},{CURRENT_DOC_ID},{USER_ID}"
-
             Dim oDT As DataTable = Database_ECM.GetDatatable(oSQL) ', "Get_Next_GUID")
             If oDT.Rows.Count > 0 Then
                 oNewGUID = oDT.Rows(0).Item(0)
@@ -4873,6 +4872,8 @@ Public Class frmValidator
 
                                     Dim oRowCount As Integer = dgv.DataSource.Rows.Count
 
+                                    LOGGER.Debug("Grid Row Count: [{0}]", oRowCount)
+
                                     'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
                                     If oIsRequired = True And oRowCount = 0 Then
                                         oMissing = True
@@ -4913,6 +4914,7 @@ Public Class frmValidator
                                                     str = String.Join(PMDelimiter, oValueList.ToArray)
 
                                                     ' 22.10.2021 Attempt at fixing empty lines appearing in indexes
+                                                    LOGGER.Debug("Grid Value before saving: [{0}]", str)
                                                     If str.Trim.Length = 0 Or str.Trim.Replace(PMDelimiter, "").Length = 0 Then
                                                         LOGGER.Debug("Empty line in Grid [{0}]. Skipping.", oControlName)
                                                         Continue For
@@ -4957,6 +4959,8 @@ Public Class frmValidator
 
 
                                     Else
+                                        LOGGER.Debug("Required = False And RowCount > 0")
+
                                         Dim oValue As New List(Of Object) From {String.Empty}
 
                                         If IDB_ACTIVE = False Then