Add better handling of the 404