OpenSong Song Import Fails

[Kevin Waddell]

OS: Ubuntu 10.10
OpenLP 1.9.7 (2.0 Beta 3)

I am trying to import a huge collection of songs, but am getting this error when I try to import some of the songs:

Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/openlp/core/ui/wizard.py", line 191, in onCurrentIdChanged
    self.performWizard()
  File "/usr/lib/pymodules/python2.6/openlp/plugins/songs/forms/songimportform.py", line 762, in performWizard
    importer.doImport()
  File "/usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/opensongimport.py", line 116, in doImport
    self.doImportFile(song_file)
  File "/usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/opensongimport.py", line 197, in doImportFile
    verse_tag = VerseType.Tags[verse_index]
TypeError: list indices must be integers, not NoneType

That second last line leaves me thinking it is because some of our verse tags are non-standard such as [CModulation] instead of [C] or [PC1] instead of [P]. If I change the tags in one of the files to a more standard tag, then song import will work fine for that particular song.