diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb
index 1142f5e..1f31f5b 100644
--- a/Aviso/frmATEZ_NCTS.vb
+++ b/Aviso/frmATEZ_NCTS.vb
@@ -135,8 +135,11 @@ Public Class frmATEZ_NCTS
 
             If sendAtezData(atez_data, atez) Then
                 Me.Close()
+            Else
+                Me.Close()
             End If
 
+
             Me.Cursor = Cursors.Default
 
         Catch ex As Exception
@@ -186,10 +189,15 @@ Public Class frmATEZ_NCTS
             lblInfo.Text = "Fehler in der API "
 
         Else
+            If azetId = -1 Then
+                atezData.fehlerbeschreibung = "Request has been sent, but not header received!"
+            End If
+
             atezData.status = "Sent"
-            atezData.atezId = IIf(azetId IsNot Nothing, azetId, "")
-            Return atezData.SAVE()
-        End If
+                atezData.atezId = IIf(azetId IsNot Nothing, azetId, "")
+                Return atezData.SAVE()
+
+            End If
 
     End Function
 
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index fbae950..6bfd33d 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -3979,9 +3979,9 @@ Public Class frmSendungsdetailsNEU
         Next
     End Sub
 
-    'Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click
-    '    cntxtAnh.Show(Cursor.Position)
-    'End Sub
+    Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btnOptionen.Click
+        cntxtAnh.Show(Cursor.Position)
+    End Sub
 
     Private Sub KopierenZwischenablageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopierenZwischenablageToolStripMenuItem.Click
         If dgvAnhang.SelectedRows.Count >= 1 Then
@@ -6414,14 +6414,16 @@ Public Class frmSendungsdetailsNEU
 
     Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp
         If e.KeyCode = Keys.Delete Then
-            If dgvATEZNCTS.SelectedRows.Count > 0 AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Then
-                If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then
-                    Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
-                    atez.delete()
-                    initdgvATEZ()
+            If dgvATEZNCTS.SelectedRows.Count > 0 Then
+                If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
+                    If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then
+                        Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
+                        atez.delete()
+                        initdgvATEZ()
+                    End If
                 End If
             End If
-        End If
+            End If
     End Sub
 
     Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click
diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb
index 4623641..863c66f 100644
--- a/Aviso/usrcntlAktDetailsATILLANeu.vb
+++ b/Aviso/usrcntlAktDetailsATILLANeu.vb
@@ -1689,12 +1689,15 @@ Public Class usrcntlAktDetailsATILLANeu
 
     Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp
         If e.KeyCode = Keys.Delete Then
-            If dgvATEZNCTS.SelectedRows.Count > 0 AndAlso Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Then
-                If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then
-                    Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
-                    atez.delete()
-                    initdgvATEZ()
+            If dgvATEZNCTS.SelectedRows.Count > 0 Then
+                If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
+                    If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then
+                        Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
+                        atez.delete()
+                        initdgvATEZ()
+                    End If
                 End If
+
             End If
         End If
     End Sub