extra null check