"O is null" patch

According to Technical 13, this seems to fix the "O is null" error on Test.Wikipedia, fixing issue #5.