Adding missing NULL pointer check