modify finder to return nil and not throw