Avoid potential NPE problem in DescriptorReconcilingStrategy