Refixed for new scrape response
Merge remote-tracking branch 'remotes/origin/develop'
Updated error reporting on an exception
Better fix for new scrape response (hopefully still allowing it to work with the old response)
Merge remote-tracking branch 'remotes/origin/develop'