Fixed obsolete null-test