Reinstate commented out "O is null" code

This reverts commit b4df6daa4541830ee77dc8ed1826728c44f48b60.