Added missing 404 handling