LPS-34213 Fix NullPointerException