Added more 404s and error messages where appropriate