diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
index 5ad56183..7f936016 100644
--- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -142,7 +142,9 @@ Namespace Jobs
                         Logger.Debug("Documents merged!")
 
                         Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
+                        Logger.Debug($"oOutputDirectoryPath is {oOutputDirectoryPath}")
                         If Not Directory.Exists(oOutputDirectoryPath) Then
+                            Logger.Debug($"Directory not existing. Creating ... ")
                             Directory.CreateDirectory(oOutputDirectoryPath)
                         End If
                         Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
@@ -171,6 +173,7 @@ Namespace Jobs
                             Throw New ApplicationException("Envelope could not be finalized")
                         End If
                     Catch ex As Exception
+                        Logger.Error(ex)
                         Logger.Warn(ex, $"Unhandled exception while working envelope [{oId}]")
                     End Try
 
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index cb6e755b..0ba66887 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -597,31 +597,40 @@ Public Class frmMain
     End Sub
 
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
-        Dim oView As GridView = GridEnvelopes.FocusedView
-        Dim selReceiver As EnvelopeReceiver
-        If oView.Name = ViewReceivers.Name Then
-            selReceiver = oView.GetRow(oView.FocusedRowHandle)
-        Else
-            MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
-        End If
-        If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
-            Exit Sub
-        End If
-        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
-
-        Dim oController = New EnvelopeEditorController(State, oEnvelope)
-        Dim Documents As New BindingList(Of EnvelopeDocument)
-        Dim Receivers As New BindingList(Of EnvelopeReceiver)
-        Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers)
-        For Each oReceiver As EnvelopeReceiver In Receivers
-            If oReceiver.Email = selReceiver.Email Then
-                If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
-                    Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
-                    MsgBox(oMsg, MsgBoxStyle.Information, Text)
-
-                End If
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Try
+            Dim oView As GridView = GridEnvelopes.FocusedView
+            Dim selReceiver As EnvelopeReceiver
+            If oView.Name = ViewReceivers.Name Then
+                selReceiver = oView.GetRow(oView.FocusedRowHandle)
+            Else
+                MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
             End If
-        Next
+            If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
+                Exit Sub
+            End If
+            Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+
+            Dim oController = New EnvelopeEditorController(State, oEnvelope)
+            Dim Documents As New BindingList(Of EnvelopeDocument)
+            Dim Receivers As New BindingList(Of EnvelopeReceiver)
+            Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers)
+            For Each oReceiver As EnvelopeReceiver In Receivers
+                If oReceiver.Email = selReceiver.Email Then
+                    If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
+                        Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
+                        MsgBox(oMsg, MsgBoxStyle.Information, Text)
+
+                    End If
+                End If
+            Next
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+
+
+        End Try
+        SplashScreenManager.CloseOverlayForm(oHandle)
 
 
     End Sub
diff --git a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb
index 9bd10a06..83723a9b 100644
--- a/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb
+++ b/EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb
@@ -68,7 +68,7 @@ Public Class Scheduler_FinishEnvelope
 
             Await Scheduler.Start()
 
-            Logger.Info("Scheduler started!")
+            Logger.Debug("Scheduler started!")
         Catch ex As Exception
             Logger.Error(ex)
         End Try
diff --git a/EnvelopeGenerator.Service/Service.vb b/EnvelopeGenerator.Service/Service.vb
index d54aae47..5cfb9242 100644
--- a/EnvelopeGenerator.Service/Service.vb
+++ b/EnvelopeGenerator.Service/Service.vb
@@ -34,7 +34,7 @@ Public Class Service
             TempFiles.Create()
 
             ' === Initialize Databases ===
-            Logger.Info("Inititalize Database ...")
+            Logger.Debug("Inititalize Database ...")
 
             If Config.ConnectionString = String.Empty Then
                 Throw New ApplicationException("Connection String is empty!")