FIX Bug: NameError: name 'null' is not defined