Added functionality for 404s