Preventing Crashes from Non-US Tracks (etc.)

This is also without the decremented API version - not sure if that is important?

I did a simple test case of two working URIs and the failing one mentioned in issue #2 and it seemed to fix the issue.