PLAT-6510 - FixUp from PR

Remove unecessary null check