Bug 4948: Catch RuntimeException from ensureParentByMerge