Improve support for 404s.