Added minor support for 404s