LPS-37530 Fix NullPointerException