LPS-36526 Fix NullPointerException