Adding nil checks before dereferencing (#5492)

(cherry picked from commit 57f2f61f86cec913a04cd37d648ac092b10df690)
1 file changed