diff --git a/Aviso/frmLaufzettel.vb b/Aviso/frmLaufzettel.vb
index 1b463b4..1758183 100644
--- a/Aviso/frmLaufzettel.vb
+++ b/Aviso/frmLaufzettel.vb
@@ -448,7 +448,12 @@ Public Class frmLaufzettel
                     End If
 
                     For Each p In paths
-                        Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf")
+                        If p <> "" Then
+                            Dim fileInfo As New IO.FileInfo(p)
+                            If Not fileInfo.Exists Then Continue For
+                            Mail.Attachments.Add(p, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Gestellungsliste.pdf")
+                        End If
+
                     Next
 
 
@@ -508,7 +513,13 @@ Public Class frmLaufzettel
                     Try
 
                         For Each p In paths
-                            VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({p}, cboPrinter.SelectedItem.ToString)
+                            If p <> "" Then
+                                If Not System.IO.Directory.Exists(p) Then Continue For
+                                Dim fileInfo As New IO.FileInfo(p)
+                                If Not fileInfo.Exists Then Continue For
+                                VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({p}, cboPrinter.SelectedItem.ToString)
+                            End If
+
                         Next
 
                         'If paths.Count = 1 Then '1 Gestellungsliste
@@ -526,16 +537,18 @@ Public Class frmLaufzettel
 
 
             Catch ex As Exception
-                MsgBox("Fehler beim erstellen der E-Mail:" & vbNewLine & ex.Message & ex.StackTrace)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, )
             End Try
 
         Else
             Dim path = SDL.FormularManagerNEU.LaufzettelZollDE(AvisoID, False,, digitalDruck)
             If path <> "" Then
-                'Process.Start(path)
-                VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString)
+                Dim fileInfo As New IO.FileInfo(path)
+                If fileInfo.Exists Then
+                    'Process.Start(path)
+                    VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString)
+                End If
             End If
-
         End If
 
         If cbxDokumenteDrucken.Checked Then
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 5f9f3c7..5c091ac 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -4958,7 +4958,8 @@ Public Class frmSendungsdetailsNEU
 
 
                 For Each r As DataGridViewRow In dgvAnhang.SelectedRows
-                    files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
+
+                    If r.Cells("anh_Typ").Value.ToString.ToLower = "pdf" Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
                 Next
                 VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)