[PLAT-4590] Prevent another possible NPE