Adds a 404 check. The oral arguments treat this scenario worse.