diff --git a/App/EmailProfiler.sln b/App/EmailProfiler.sln
index cd2adff..c4216c1 100644
--- a/App/EmailProfiler.sln
+++ b/App/EmailProfiler.sln
@@ -10,6 +10,9 @@ EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Common", "EmailProfiler.Common\EmailProfiler.Common.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "wisag_check_Att", "wisag_check_Att\wisag_check_Att.vbproj", "{CD67B0B9-A7DE-447D-9982-E7AC43481DDC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9F748DCD-952E-40A0-9DAD-65BF8A39B231} = {9F748DCD-952E-40A0-9DAD-65BF8A39B231}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/App/wisag_check_Att/Form1.Designer.vb b/App/wisag_check_Att/Form1.Designer.vb
index 1e68b2b..deb881c 100644
--- a/App/wisag_check_Att/Form1.Designer.vb
+++ b/App/wisag_check_Att/Form1.Designer.vb
@@ -98,14 +98,14 @@ Partial Class Form1
         '
         'BarButtonItem4
         '
-        Me.BarButtonItem4.Caption = "Extract PDF-Attachments"
+        Me.BarButtonItem4.Caption = "Extract Attachments from PDF-File"
         Me.BarButtonItem4.Id = 6
         Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem4.Name = "BarButtonItem4"
         '
         'btExtractMailAttachments
         '
-        Me.btExtractMailAttachments.Caption = "Extract Mail-Attachments"
+        Me.btExtractMailAttachments.Caption = "Extract Attachments from EML-File"
         Me.btExtractMailAttachments.Id = 7
         Me.btExtractMailAttachments.ImageOptions.SvgImage = CType(resources.GetObject("btExtractMailAttachments.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.btExtractMailAttachments.Name = "btExtractMailAttachments"
diff --git a/App/wisag_check_Att/Form1.vb b/App/wisag_check_Att/Form1.vb
index 2c62fb6..57c8d97 100644
--- a/App/wisag_check_Att/Form1.vb
+++ b/App/wisag_check_Att/Form1.vb
@@ -70,6 +70,12 @@ Public Class Form1
     Private Sub btRunEmailCheck_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btRunEmailCheck.ItemClick
         ' Check Email
         ListBox1.Items.Clear()
+
+        If bsifolderbrowser Is Nothing Or String.IsNullOrEmpty(bsifolderbrowser.Caption) Then
+            MsgBox("Es wurde kein input-Verzeichnis konfiguriert. Abbruch!", MsgBoxStyle.Information)
+            Return
+        End If
+
         Dim di As New DirectoryInfo(bsifolderbrowser.Caption)
         ' Get a reference to each file in that directory.
         Dim fiArr As FileInfo() = di.GetFiles()
diff --git a/App/wisag_check_Att/wisag_check_Att.vbproj b/App/wisag_check_Att/wisag_check_Att.vbproj
index 241edfc..fa347f3 100644
--- a/App/wisag_check_Att/wisag_check_Att.vbproj
+++ b/App/wisag_check_Att/wisag_check_Att.vbproj
@@ -65,6 +65,9 @@
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
+    <Reference Include="EmailProfiler.Common">
+      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
+    </Reference>
     <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
       <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>