WL-2816 Fix for when moving a site fails half way through.