diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 0ec6d93..0c48cb1 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1200,12 +1200,14 @@ Public Class frmIndex
             End If
             Dim streamresult = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
 
-            If CONFIG.Config.DeleteOriginalFile = True Then
-                Try
-                    My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE)
-                Catch ex As Exception
-                    LOGGER.Error(ex)
-                End Try
+            If File.Exists(CURRENT_NEWFILENAME) And streamresult = True Then
+                If CONFIG.Config.DeleteOriginalFile = True Then
+                    Try
+                        My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE)
+                    Catch ex As Exception
+                        LOGGER.Error(ex)
+                    End Try
+                End If
             End If
 
             Return streamresult
@@ -2087,29 +2089,29 @@ Public Class frmIndex
                             'Die Datei verschieben
                             If Move_File2_Target() = True Then
                                 LOGGER.Debug(" ...Move_File2_Target durchlaufen")
-                                'Die Originaldatei löschen
-                                If DropType = "|DROPFROMFSYSTEM|" Then
-                                    If CURR_DELETE_ORIGIN = True Then
-                                        'Die temporäre Datei löschen
-                                        DeleteFile()
-                                    End If
-                                ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
-                                    'Die temporäre Datei löschen
-                                    If CURRENT_WORKFILE.EndsWith("pdf") Then
-                                        DocumentViewer1.Done()
-                                        DocumentViewer1.CloseDocument()
-                                    End If
+                                ''Die Originaldatei löschen
+                                'If DropType = "|DROPFROMFSYSTEM|" Then
+                                '    If CURR_DELETE_ORIGIN = True Then
+                                '        'Die temporäre Datei löschen
+                                '        DeleteFile()
+                                '    End If
+                                'ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
+                                '    'Die temporäre Datei löschen
+                                '    If CURRENT_WORKFILE.EndsWith("pdf") Then
+                                '        DocumentViewer1.Done()
+                                '        DocumentViewer1.CloseDocument()
+                                '    End If
 
-                                    DeleteFile()
-                                ElseIf (DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|") Then
-                                    'Die temporäre Datei löschen
-                                    DeleteFile()
+                                '    DeleteFile()
+                                'ElseIf (DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|") Then
+                                '    'Die temporäre Datei löschen
+                                '    DeleteFile()
 
-                                ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
-                                    'Die temporäre Datei löschen
-                                    DeleteFile()
+                                'ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
+                                '    'Die temporäre Datei löschen
+                                '    DeleteFile()
 
-                                End If
+                                'End If
 
                                 CURRENT_LASTDOKART = cmbDokumentart.Text
                                 LOGGER.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
@@ -2232,29 +2234,22 @@ Public Class frmIndex
         Me.Cursor = Cursors.Default
     End Sub
     Private Function Move_File2_Target()
-        Dim err As Boolean = False
+        Dim oError As Boolean
         Try
-            Dim sql As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID
-            Dim Folder_for_index = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
-            If Not IsDBNull(Folder_for_index) Then
-                CreateFolderForIndex(Folder_for_index)
+            Dim oSQL As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID
+            Dim oFolderForIndex = ClassDatabase.Execute_Scalar(oSQL, MyConnectionString, True)
+            If Not IsDBNull(oFolderForIndex) Then
+                CreateFolderForIndex(oFolderForIndex)
+            Else
+                CreateFolderForIndex(String.Empty)
             End If
 
             If CURR_DOKART_WD_DIRECT = False Then
                 'Datei verschieben
-                err = Move_Rename_Only(CURRENT_WORKFILE, CURRENT_NEWFILENAME, CURR_WORKFILE_EXTENSION, VERSION_DELIMITER)
+                oError = Move_Rename_Only(CURRENT_WORKFILE, CURRENT_NEWFILENAME, CURR_WORKFILE_EXTENSION, VERSION_DELIMITER)
             Else
-                'If CURRENT_NEWFILENAME.Contains("//") Then
-                '    CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("//", "/")
-                'End If
-                'If CURRENT_NEWFILENAME.Contains("\\") Then
-                '    CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("\\", "\")
-                'End If
                 Dim oExportSuccessful As Boolean = False
                 'Variable Folder
-
-
-
                 If DropType = "|DROPFROMFSYSTEM|" Or DropType = "|OUTLOOK_ATTACHMENT|" Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|FW_SIMPLEINDEXER|" Then
                     oExportSuccessful = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE)
                 ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|" Then
@@ -2262,11 +2257,8 @@ Public Class frmIndex
                 End If
                 If oExportSuccessful = True Then
                     'Kein Fehler in Export2windream
-                    err = False
+                    oError = False
                     If Write_Indizes() = True Then
-
-
-
                         'Kein Fehler in Setzen der windream-Indizes
                         Dim Insert_String As String
                         Try
@@ -2299,13 +2291,13 @@ Public Class frmIndex
                             MsgBox("Error in Insert-History - View logfile: " & ex.Message, MsgBoxStyle.Critical)
                             LOGGER.Info(" - Unexpected error in Insert-History - Fehler: " & vbNewLine & ex.Message)
                             LOGGER.Info(" - Unexpected error in Insert-History - SQL: " & Insert_String)
-                            err = True
+                            oError = True
                         End Try
                     Else
-                        err = True
+                        oError = True
                     End If
                 Else
-                    err = True
+                    oError = True
 
                     If USER_LANGUAGE = "de-DE" Then
                         MsgBox("Der Export nach windream war nicht erfolgreich - Check LogFile", MsgBoxStyle.Exclamation)
@@ -2316,7 +2308,7 @@ Public Class frmIndex
             End If
             'False oder True zurückgeben
             'Kein Fehler aufgetreten
-            If err = False Then
+            If oError = False Then
                 Return True
             Else
                 'Fehler aufgetreten
@@ -2324,7 +2316,7 @@ Public Class frmIndex
             End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected Error in Move File2Target:")
-            err = True
+            oError = True
         End Try
     End Function