Treat corrupt image as 404
Merge branch 'stage'