LPS-34991 avoid nullpointer exception