Added error output in headless execution
Merge branch 'temp2'