Bug #1794: Make vmfs/cp and vmware/cp more robust