LPS-41538 fix nullpointer exception