From 8ab4442840ef9cc858ddce533dff2b6f86b791a5 Mon Sep 17 00:00:00 2001
From: Remy <remyvarma@gmail.com>
Date: Sun, 21 Aug 2011 03:29:02 -0700
Subject: [PATCH] Better error catching for the lyrics module

---
 headphones/lyrics.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/headphones/lyrics.py b/headphones/lyrics.py
index 4a077f31..a3e89352 100644
--- a/headphones/lyrics.py
+++ b/headphones/lyrics.py
@@ -20,7 +20,11 @@ def getLyrics(artist, song):
 		logger.warn('Error opening: %s. Error: %s' % (searchURL, e))
 		return
 	
-	parseddata = minidom.parseString(data)
+	try:
+		parseddata = minidom.parseString(data)
+	except Exception, e:
+		logger.warn('Error parsing data from url: %s. Error: %s' % (searchURL, e))
+		return
 	
 	url = parseddata.getElementsByTagName("url")
 	
@@ -38,6 +42,9 @@ def getLyrics(artist, song):
 		
 	m = re.compile('''<div class='lyricbox'><div class='rtMatcher'>.*?</div>(.*?)<!--''').search(lyricspage)
 	
+	if not m:
+		return
+		
 	lyrics = convert_html_entities(m.group(1)).replace('<br />', '\n')
 	lyrics = re.sub('<.*?>', '', lyrics)