LPS-42051 fix nullpointer