cleaner check for not-found
comments