LPS-35566 SF - missing nullpointer check