remove the convoluted null check