From a2e38f0e39f5cfcf282c6246fed2ea6b9cef52c1 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 10 Jul 2014 09:57:04 +0930
Subject: [PATCH] catch the error from CouchPotato. Helps #472 #471

---
 nzbtomedia/autoProcess/autoProcessMovie.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py
index c798ab8b..1c329437 100644
--- a/nzbtomedia/autoProcess/autoProcessMovie.py
+++ b/nzbtomedia/autoProcess/autoProcessMovie.py
@@ -29,9 +29,16 @@ class autoProcessMovie:
             r = requests.get(url, params=params, verify=False)
         except requests.ConnectionError:
             logger.error("Unable to open URL %s" % url)
-            return
+            return results
+
+        try:
+            result = r.json()
+        except:
+            logger.error("CouchPotato returned the following non-json data")
+            for line in r.iter_lines():
+                logger.error("%s" %(line))
+            return results
 
-        result = r.json()
         if not result['success']:
             if 'error' in result:
                 logger.error(str(result['error']))