fix: null pointers check (#2422)

fix: null pointers check (#2422) #8619