Fix handling of empty songs, fixes #4