[PLAT-4789] null handling to avoid IllegalArgumentException