* [FORWARD PORT] LPS-50926 folder may not exist

Note that a commit is missing from this forward port. That commit fixed an error in `incremental-search-hook`, not available in master.