"O is null" patch (again)

Accidentally pulled to master and not testing, reattempting.