NotFound tightening