Revert "Allow for nils in the track list"

This reverts commit 3ba8fcde71305a8a9ec7aeabd594f30ffeb80713.