LPS-33542 Fix NullPointerException
LPS-33642 LPS-34604 Fix NullPointerException