added null ptr check
1 file changed