Null check the right thing