Potentially fixed 'null' territory bug