CXX-341 remove unneeded null check