NotFound handling fixed