Add null-pointer check