Corrections for error file and failedbuild file generation
Merge commit '8f70998d94ea72ad911736f7d3341af9f1d13db4'