Introduce catch-errors function.
Fix few updaters with removing unnecessary rebuilds overhead.