diff --git a/EnvelopeGenerator.Common/Services/TemplateService.vb b/EnvelopeGenerator.Common/Services/TemplateService.vb
index 72faf225..4adab2a8 100644
--- a/EnvelopeGenerator.Common/Services/TemplateService.vb
+++ b/EnvelopeGenerator.Common/Services/TemplateService.vb
@@ -42,7 +42,7 @@ Public Class TemplateService
     End Sub
 
     Public Sub FillEnvelopeDeletedEmailBody(pEmailData As EmailData, pReason As String)
-        InitDictionary(pEmailData)
+        InitDictionary(pEmailData, pReason)
         Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentDeleted)
 
         pEmailData.EmailBody = FillTemplate(oTemplate.Body, pReason)
@@ -78,6 +78,7 @@ Public Class TemplateService
 
         For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary
             If oText.Contains(dictItem.Key) Then
+
                 oText = oText.Replace(dictItem.Key, dictItem.Value)
 
             End If
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index 3dd4c115..760fd556 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -152,19 +152,21 @@ Public Class frmMain
     End Sub
 
     Private Sub btnDeleteEnvelope_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeleteEnvelope.ItemClick
-        Dim oSelectedRows = ViewEnvelopes.GetSelectedRows()
-        If oSelectedRows.Count > 0 Then
-            Dim ofrmAbort As New frmRueckruf
-            frmRueckruf.ShowDialog()
-            MsgBox("Abort: " + frmRueckruf.Abort & vbNewLine & "Reason: " + frmRueckruf.Reject_reason)
-            If frmRueckruf.Abort = False Then
-                MsgBox(frmRueckruf.Abort & vbNewLine & frmRueckruf.Reject_reason)
-                DeleteEnvelope(oSelectedRows.First, frmRueckruf.Reject_reason)
-            Else
+        Try
+            Dim oSelectedRows = ViewEnvelopes.GetSelectedRows()
+            If oSelectedRows.Count > 0 Then
+                Dim ofrmAbort As New frmRueckruf
+                frmRueckruf.ShowDialog()
+                MsgBox("Abort: " & frmRueckruf.Abort & vbNewLine & "Reason: " & frmRueckruf.Reject_reason)
+                If frmRueckruf.Abort = False Then
+                    DeleteEnvelope(oSelectedRows.First, frmRueckruf.Reject_reason)
+                End If
 
             End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        End Try
 
-        End If
     End Sub
 
     Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
diff --git a/EnvelopeGenerator.Form/frmRueckruf.vb b/EnvelopeGenerator.Form/frmRueckruf.vb
index da93ca87..c40f1a71 100644
--- a/EnvelopeGenerator.Form/frmRueckruf.vb
+++ b/EnvelopeGenerator.Form/frmRueckruf.vb
@@ -21,7 +21,10 @@ Public Class frmRueckruf
             End If
             tsstatus.Text = ""
             Continue_Reject = True
+            Dim oReason = txtReason.Text
+            oReason.Replace(vbCr, "<br>").Replace(vbLf, "<br>")
             Reject_reason = txtReason.Text
+            Me.Close()
         Else
             tsstatus.Text = "Please add a reason for aborting - " & Now
         End If