LPS-33695 - removing null checks