MODE-2071 Corrected NPE in upgraded repository from 3.2