Added a better exception for 404s