Fixing tests, better error handling

Is it not really all that valuable to report the resource URL that the error happened on?