Add ContentNotFound handling