[PLAT-4896] Fix NPE