Tidy up handling for the not-enough-songs case (fixes #10)