diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb
index afc20f2..ad1a205 100644
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
@@ -368,14 +368,15 @@ Public Class clsWorkEmail
             For Each oRow As DataRow In PM_ROW
                 DeleteMail = oRow("DELETE_MAIL")
                 CurrentMailProcessName = oRow.Item("PROCESS_NAME")
+
+                WM_OBJEKTTYPE = oRow.ItemEx("WM_OBJEKTTYPE", "")
                 WM_REFERENCE_INDEX = oRow.ItemEx("WM_REFERENCE_INDEX", "")
                 WM_VECTOR_LOG = oRow.ItemEx("WM_VECTOR_LOG", "")
+                WM_IDX_BODY_TEXT = oRow.ItemEx("WM_IDX_BODY_TEXT", "")
+                WM_IDX_BODY_SUBSTR_LENGTH = oRow.ItemEx("WM_IDX_BODY_SUBSTR_LENGTH", 0)
 
-                WM_OBJEKTTYPE = oRow.Item("WM_OBJEKTTYPE")
-                WM_IDX_BODY_TEXT = oRow.Item("WM_IDX_BODY_TEXT")
-                WM_IDX_BODY_SUBSTR_LENGTH = oRow.Item("WM_IDX_BODY_SUBSTR_LENGTH")
                 Dim oPathOriginal As String = oRow.ItemEx("PATH_ORIGINAL", "")
-                Dim oExtractMainPath As String = oRow("PATH_EMAIL_TEMP")
+                Dim oExtractMainPath As String = oRow.ItemEx("PATH_EMAIL_TEMP", "")
                 Try
                     Dim oSplit As String()
                     Dim oStorage As String
@@ -573,7 +574,7 @@ Public Class clsWorkEmail
                 oPattern2 = ""
             End Try
 
-            Dim oReg As Regex = New Regex(oPattern1, RegexOptions.IgnoreCase)
+            Dim oReg As New Regex(oPattern1, RegexOptions.IgnoreCase)
             Dim oMatch As Match = oReg.Match(CURRENT_MAIL_BODY_ALL)
             Dim oClearedBodyText = CURRENT_MAIL_BODY_ALL
             Do While oMatch.Success
@@ -581,7 +582,7 @@ Public Class clsWorkEmail
                 oMatch = oMatch.NextMatch()
             Loop
             _Logger.Debug($"Cleared bodytext after Regex1 is: {oClearedBodyText}")
-            Dim oReg2 As Regex = New Regex(oPattern2, RegexOptions.IgnoreCase)
+            Dim oReg2 As New Regex(oPattern2, RegexOptions.IgnoreCase)
             Dim oMatch2 As Match = oReg2.Match(oClearedBodyText)
 
             Do While oMatch2.Success
@@ -612,26 +613,26 @@ Public Class clsWorkEmail
             Dim oSplit = CURRENT_MAIL_BODY_ALL.Split(Environment.NewLine)
             Dim oCount As Integer = 0
             Dim oReadLength As Integer = 0
-            For Each ostr As String In oSplit
-                ostr = ostr.Replace(vbCrLf, "")
-                If ostr = String.Empty Then
+            For Each oString As String In oSplit
+                oString = oString.Replace(vbCrLf, "")
+                If oString = String.Empty Then
                     Continue For
                 End If
                 oCount += 1
                 If oCount = 1 Then
-                    CURRENT_MAIL_BODY_ANSWER1 = ostr
+                    CURRENT_MAIL_BODY_ANSWER1 = oString
                 Else
-                    If ostr.StartsWith("##") Then
+                    If oString.StartsWith("##") Then
                         Exit For
                     ElseIf oCount = 2 Then
-                        CURRENT_MAIL_BODY_Substr2 = ostr
+                        CURRENT_MAIL_BODY_Substr2 = oString
                     Else
-                        If ((oReadLength + ostr.Length) >= WM_IDX_BODY_SUBSTR_LENGTH) Or ostr.StartsWith("##") Then
+                        If ((oReadLength + oString.Length) >= WM_IDX_BODY_SUBSTR_LENGTH) Or oString.StartsWith("##") Then
                             Exit For
                         End If
-                        CURRENT_MAIL_BODY_Substr2 = CURRENT_MAIL_BODY_Substr2 & vbNewLine & ostr
+                        CURRENT_MAIL_BODY_Substr2 = CURRENT_MAIL_BODY_Substr2 & vbNewLine & oString
                     End If
-                    oReadLength += ostr.Length
+                    oReadLength += oString.Length
                 End If
             Next