Much better null track handling