From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 9 May 2014 21:34:53 +0000 (+0700)
Subject: [vevo] Add friendly error output (#2874)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=e97e53eeed0c80f514839f2731a2dd5413e62cca

[vevo] Add friendly error output (#2874)
---

diff --git a/youtube_dl/extractor/vevo.py b/youtube_dl/extractor/vevo.py
index ee47c30ba..ea34a8f16 100644
--- a/youtube_dl/extractor/vevo.py
+++ b/youtube_dl/extractor/vevo.py
@@ -134,7 +134,13 @@ class VevoIE(InfoExtractor):
         video_id = mobj.group('id')
 
         json_url = 'http://videoplayer.vevo.com/VideoService/AuthenticateVideo?isrc=%s' % video_id
-        video_info = self._download_json(json_url, video_id)['video']
+        response = self._download_json(json_url, video_id)
+        video_info = response['video']
+
+        if not video_info:
+            if 'statusMessage' in response:
+                raise ExtractorError('%s said: %s' % (self.IE_NAME, response['statusMessage']), expected=True)
+            raise ExtractorError('Unable to extract videos')
 
         formats = self._formats_from_json(video_info)