diff --git a/app/DD_PM_WINDREAM/ClassFinalIndex.vb b/app/DD_PM_WINDREAM/ClassFinalIndex.vb
index 596cd7c..6908830 100644
--- a/app/DD_PM_WINDREAM/ClassFinalIndex.vb
+++ b/app/DD_PM_WINDREAM/ClassFinalIndex.vb
@@ -42,6 +42,11 @@
         Try
             Dim props As FinalIndexProperties = obj
             Dim i As Integer = indcies.IndexOf(indexName)
+
+            If Not indcies.Contains(indexName) Then
+                Return obj
+            End If
+
             Dim type As Integer = types.Item(i)
             Dim isVector = value.StartsWith(PREFIX_VECTOR)
 
diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb
index 2d17ec5..93c8340 100644
--- a/app/DD_PM_WINDREAM/frmAdministration.vb
+++ b/app/DD_PM_WINDREAM/frmAdministration.vb
@@ -726,6 +726,7 @@ Public Class frmAdministration
     Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
         TabControlFinalIndices.Enabled = True
         tsBtnCancel_old.Visible = True
+        tsBtnCancel.Visible = True
         cmbIndexe.Items.Clear()
         cmbIndexe2.Items.Clear()
         Dim indexe = _windreamPM.GetIndicesByObjecttype(cmbObjekttypen.Text)
@@ -743,6 +744,8 @@ Public Class frmAdministration
         TabControlFinalIndices.Enabled = False
         INSERT_ACTIVE = False
         tsBtnCancel_old.Visible = False
+        tsBtnCancel.Visible = False
+        BindingNavigatorAddNewItem.Visible = True
 
         txtBezeichner.Text = String.Empty
         txtindexwert_final.Text = String.Empty
@@ -976,7 +979,7 @@ Public Class frmAdministration
         End Try
     End Sub
 
-    Private Sub tsBtnCancel_Click(sender As Object, e As EventArgs) Handles tsBtnCancel_old.Click
+    Private Sub tsBtnCancel_Click(sender As Object, e As EventArgs) Handles tsBtnCancel.Click
         CancelFinalIndexInsert()
     End Sub