Catch more errors while incremental searching
Merge branch 'fix-catch-errors'