diff --git a/headphones/mb.py b/headphones/mb.py
index 4a83bd68..39346fa7 100644
--- a/headphones/mb.py
+++ b/headphones/mb.py
@@ -69,7 +69,7 @@ def findArtist(name, limit=1):
 				artistResults = q.getArtists(ws.ArtistFilter(query=name, limit=limit))
 				break
 			except WebServiceError, e:
-				logger.warn('Attempt to query MusicBrainz for %s failed: %s' % (name, e))
+				logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
 				attempt += 1
 				time.sleep(10)
 		
@@ -129,7 +129,7 @@ def findRelease(name, limit=1):
 				releaseResults = q.getReleases(ws.ReleaseFilter(query=name, limit=limit))
 				break
 			except WebServiceError, e:
-				logger.warn('Attempt to query MusicBrainz for %s failed: %s' % (name, e))
+				logger.warn('Attempt to query MusicBrainz for "%s" failed: %s' % (name, str(e)))
 				attempt += 1
 				time.sleep(10)
 		
@@ -171,7 +171,7 @@ def getArtist(artistid, extrasonly=False):
 				artist = q.getArtistById(artistid, inc)
 				break
 			except WebServiceError, e:
-				logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s. Sleeping 5 seconds: %s' % (artistid, e))
+				logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s (%s)' % (artistid, str(e))) 
 				attempt += 1
 				time.sleep(5)
 				
@@ -222,7 +222,7 @@ def getArtist(artistid, extrasonly=False):
 						artist = q.getArtistById(artistid, inc)
 						break
 					except WebServiceError, e:
-						logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s. Sleeping 5 seconds' % artistid)
+						logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s (%s)' % (artistid, str(e)))
 						attempt += 1
 						time.sleep(5)
 						
@@ -262,7 +262,7 @@ def getReleaseGroup(rgid):
 				releaseGroup = q.getReleaseGroupById(rgid, inc)
 				break
 			except WebServiceError, e:
-				logger.warn('Attempt to retrieve information from MusicBrainz for release group "%s" failed. Sleeping 5 seconds' % rgid)
+				logger.warn('Attempt to retrieve information from MusicBrainz for release group "%s" failed (%s)' % (rgid, str(e)))
 				attempt += 1
 				time.sleep(5)
 	
@@ -284,7 +284,7 @@ def getReleaseGroup(rgid):
 					releaseResult = q.getReleaseById(release.id, inc)
 					break
 				except WebServiceError, e:
-					logger.warn('Attempt to retrieve release information for %s from MusicBrainz failed: %s. Sleeping 5 seconds' % (releaseResult.title, e))
+					logger.warn('Attempt to retrieve release information for %s from MusicBrainz failed (%s)' % (releaseResult.title, str(e)))
 					attempt += 1
 					time.sleep(5)		
 			
@@ -395,7 +395,7 @@ def getRelease(releaseid):
 				results = q.getReleaseById(releaseid, inc)
 				break
 			except WebServiceError, e:
-				logger.warn('Attempt to retrieve information from MusicBrainz for release "%s" failed: %s. SLeeping 5 seconds' % (releaseid, e))
+				logger.warn('Attempt to retrieve information from MusicBrainz for release "%s" failed (%s)' % (releaseid, str(e)))
 				attempt += 1
 				time.sleep(5)	
 		
@@ -467,7 +467,7 @@ def findArtistbyAlbum(name):
 			results = q.getReleaseGroups(f)
 			break
 		except WebServiceError, e:
-			logger.warn('Attempt to query MusicBrainz for %s failed: %s. Sleeping 5 seconds.' % (name, e))
+			logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
 			attempt += 1
 			time.sleep(10)	
 	
@@ -501,8 +501,8 @@ def findAlbumID(artist=None, album=None):
 		try:
 			results = q.getReleaseGroups(f)
 			break
-		except Exception, e:
-			logger.warn('Attempt to query MusicBrainz for %s - %s failed: %s. Sleeping 5 seconds.' % (artist, album, e))
+		except WebServiceError, e:
+			logger.warn('Attempt to query MusicBrainz for %s - %s failed (%s)' % (artist, album, str(e)))
 			attempt += 1
 			time.sleep(10)