missed a few null !=