Improved robustness wrt stale DB contents