'retrier' made @timoxley sad :(

Also fits with the theme of making diagnostic output clearer.
Include extra data on errors other than 404
add test for new error handling