Fix crash when track number is missing
Merge branch 'pr-3'