forgot null check