Make the clone command more robust.