Bug 6977: Follow-up patch : catch CloneSubfield errors