diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
index d35f149b..4ca0f86a 100644
--- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -47,6 +47,7 @@ Namespace Jobs
 
         Private Class EnvelopeData
             Public EnvelopeId As Integer
+            Public EnvelopeUUID As String
             Public DocumentPath As String
             Public AnnotationData As List(Of String)
             Public DocAsByte As Byte()
@@ -421,7 +422,7 @@ Namespace Jobs
                 Dim split As String() = oDirectorySource.Split("\")
                 ParentFolderUID = split(split.Length - 1)
             Else
-                ParentFolderUID = pEnvelopeData.EnvelopeId
+                ParentFolderUID = pEnvelopeData.EnvelopeUUID
             End If
 
 
@@ -443,7 +444,7 @@ Namespace Jobs
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
-            Dim oSql = $"SELECT T.GUID, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID,T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
                 JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
                 WHERE T.GUID = {pEnvelopeId}"
             Dim oTable As DataTable = Database.GetDatatable(oSql)
@@ -457,7 +458,8 @@ Namespace Jobs
                 .EnvelopeId = pEnvelopeId,
                 .DocumentPath = oRow.ItemEx("FILEPATH", ""),
                 .AnnotationData = oAnnotationData,
-                .DocAsByte = DirectCast(oRow.Item("BYTE_DATA"), Byte())
+                .DocAsByte = DirectCast(oRow.Item("BYTE_DATA"), Byte()),
+                .EnvelopeUUID = oRow.ItemEx("ENVELOPE_UUID", "")
             }
 
             Logger.Debug("Document path: [{0}]", oData.DocumentPath)
diff --git a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb
index f85a8155..df85cf87 100644
--- a/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb
+++ b/EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb
@@ -38,6 +38,8 @@ Namespace Jobs.FinalizeDocument
 
                     For Each oJSON In pInstantJSONList
                         If AddInstantJSONAnnotationToPDF(oJSON) = False Then
+                            Logger.Warn($"Error in AddInstantJSONAnnotationToPDF - oJson: ")
+                            Logger.Warn(oJSON)
                             Throw New BurnAnnotationException($"Adding Annotation failed")
                         End If
                     Next