added null ptr checks