Some fixes related to null result of countObjects.