Changed 404 handling.