diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index 3a351f2f732816a26d075db81b55882949ad6e98..a4e702533e8f62d74ec449edaf736c75accdd00d 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -162,12 +162,13 @@ class GenericProvider:
                     torrent_hash = b16encode(b32decode(torrent_hash)).upper()
 
                 if not torrent_hash:
-                    logger.log("Unable to extract torrent hash from link: " + ex(result.url), logger.ERROR)
+                    logger.log("Unable to extract torrent hash from magnet: " + ex(result.url), logger.ERROR)
                     return (urls, filename)
 
                 urls = [x.format(torrent_hash=torrent_hash, torrent_name=torrent_name) for x in self.btCacheURLS]
             except:
-                urls = [result.url]
+                logger.log("Unable to extract torrent hash or name from magnet: " + ex(result.url), logger.ERROR)
+                return (urls, filename)
         else:
             urls = [result.url]