fixes #3312 - tweaking nil tests; private.
fixes #3312 - add tests.