STUDIO-3066
Fix npe in Comparator