diff --git a/Global_Indexer/ClassFileDrop.vb b/Global_Indexer/ClassFileDrop.vb
index a1bc217..98c2fd6 100644
--- a/Global_Indexer/ClassFileDrop.vb
+++ b/Global_Indexer/ClassFileDrop.vb
@@ -1,6 +1,6 @@
 Imports System.IO
 Imports Microsoft.Office.Interop
-
+Imports DigitalData.Modules.Language.Utils
 
 
 Public Class ClassFileDrop
@@ -24,8 +24,19 @@ Public Class ClassFileDrop
                 oFilesFromEvent = e.Data.GetData(DataFormats.FileDrop)
                 ' Loop through the array and add the files to the list. 
                 For oIndex = 0 To oFilesFromEvent.Length - 1
-                    LOGGER.Info("Simple FileDrop - File: " & oFilesFromEvent(oIndex))
-                    FilesDropped.Add("|DROPFROMFSYSTEM|" & oFilesFromEvent(oIndex))
+                    'Dim oFileName As String = e.Data.GetData("FileNameW")
+
+
+                    Dim oFileName = oFilesFromEvent(oIndex)
+
+
+                    If TestContainsInvalidCharacters(oFileName) Then
+                        MsgBox($"Die Datei [{oFileName}] enthält ungültige Zeichen im Dateinamen. Bitte benennen Sie sie vor der Ablage um.", MsgBoxStyle.Critical, "Global Indexer")
+                        Return False
+                    End If
+
+                    LOGGER.Info("Simple FileDrop - File: " & oFileName)
+                    FilesDropped.Add("|DROPFROMFSYSTEM|" & oFileName)
 
                     'ReDim Preserve FilesDropped(oIndex)
                     'FilesDropped(oIndex) = "|DROPFROMFSYSTEM|" & oFilesFromEvent(oIndex)
diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb
index 69f06a7..e490b75 100644
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -112,12 +112,14 @@ Public Class frmStart
 
             For Each Filerow As DataRow In DTACTUAL_FILES.Rows
                 Dim oFileString As String = Filerow.Item("FILENAME2WORK")
+                Dim oFileGuid = Filerow.Item("GUID")
+                Dim oFileHash = Utils.NotNull(Filerow.Item("FILE_HASH"), "")
                 LOGGER.Info("Processing user file {0}", oFileString)
 
-                CURRENT_FILENAME = Filerow.Item("FILENAME2WORK")
-                CURRENT_WORKFILE_GUID = Filerow.Item(0)
-                CURRENT_WORKFILE = Filerow.Item("FILENAME2WORK")
-                CURRENT_WORKFILE_HASH = Utils.NotNull(Filerow.Item("FILE_HASH"), "")
+                CURRENT_FILENAME = oFileString
+                CURRENT_WORKFILE_GUID = oFileGuid
+                CURRENT_WORKFILE = oFileString
+                CURRENT_WORKFILE_HASH = oFileHash
 
                 LOGGER.Info(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE)
                 If IO.File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then