LPS-32710 fix nullpointer exception