LPS-35378 Fix null pointer