NXP-13110 fix NPE when saving a distribution for a first time