diff --git a/couchpotato/core/downloaders/blackhole/__init__.py b/couchpotato/core/downloaders/blackhole/__init__.py
index 6b5279a..91164d6 100644
--- a/couchpotato/core/downloaders/blackhole/__init__.py
+++ b/couchpotato/core/downloaders/blackhole/__init__.py
@@ -13,7 +13,7 @@ config = [{
             'list': 'download_providers',
             'name': 'blackhole',
             'label': 'Black hole',
-            'description': 'Download the NZB/Torrent to a specific folder.',
+            'description': 'Download the NZB/Torrent to a specific folder. <em>Note: Seeding and copying/linking features do <strong>not</strong> work with Black hole</em>.',
             'wizard': True,
             'options': [
                 {
diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
index f99c92c..54bdcdc 100755
--- a/couchpotato/core/plugins/renamer/main.py
+++ b/couchpotato/core/plugins/renamer/main.py
@@ -83,6 +83,7 @@ class Renamer(Plugin):
         }
 
     def scan(self, release_download = None):
+        if not release_download: release_download = {}
 
         if self.isDisabled():
             return
@@ -95,7 +96,7 @@ class Renamer(Plugin):
         to_folder = sp(self.conf('to'))
 
         # Get movie folder to process
-        movie_folder = release_download and release_download.get('folder')
+        movie_folder = release_download.get('folder')
 
         # Get all folders that should not be processed
         no_process = [to_folder]
@@ -122,7 +123,7 @@ class Renamer(Plugin):
             log.debug('The provided movie folder %s does not exist. Trying to find it in the \'from\' folder.', movie_folder)
 
             # Update to the from folder
-            if len(release_download.get('files')) == 1:
+            if len(splitString(release_download.get('files'), '|')) == 1:
                 new_movie_folder = from_folder
             else:
                 new_movie_folder = os.path.join(from_folder, os.path.basename(movie_folder))