diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 107c11821c..3127ee1e66 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -721,7 +721,8 @@ Index =
           thread.setPage(Index.threadPosition[ID] // Index.threadsNumPerPage + 1)
         else
           obj = Index.parsedThreads[ID]
-          OP = new Post g.SITE.Build.post(obj), thread, g.BOARD
+          opRoot = g.SITE.Build.post(obj)
+          OP = new Post opRoot, thread, g.BOARD
           OP.filterResults = obj.filterResults
           newPosts.push OP
 
@@ -733,6 +734,7 @@ Index =
         errors.push
           message: "Parsing of Thread No.#{thread} failed. Thread will be skipped."
           error: err
+          html: opRoot?.outerHTML
     Main.handleErrors errors if errors
 
     if withReplies
@@ -763,6 +765,7 @@ Index =
           errors.push
             message: "Parsing of Post No.#{data.no} failed. Post will be skipped."
             error: err
+            html: node?.outerHTML
       $.add thread.nodes.root, nodes
 
     Main.handleErrors errors if errors
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index 0fbf15c65e..d1f0d26828 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -382,6 +382,7 @@ Main =
         errors.push
           message: "Parsing of Post No.#{postRoot.id.match(/\d+/)} failed. Post will be skipped."
           error: err
+          html: postRoot.outerHTML
     return
 
   addThreads: (records) ->
@@ -458,6 +459,7 @@ Main =
         errors.push
           message: "Parsing of Catalog Thread No.#{(threadRoot.dataset.id or threadRoot.id).match(/\d+/)} failed. Thread will be skipped."
           error: err
+          html: threadRoot.outerHTML
     return
 
   addCatalogThreads: (records) ->