Fix the NotFound handling