Don't explode if an image 404s
Even greater realism in mocking a 404 error
Merge branch '404' into hotfix