Added better 404 handling.