Return nil for non-annotated lyric instead of raising
Minor refactoring