Catch more errors while incremental searching
Merge branch 'catch-errors' into dev