diff --git a/cistern/cistern.py b/cistern/cistern.py
index ca3ca65..af7603f 100755
--- a/cistern/cistern.py
+++ b/cistern/cistern.py
@@ -135,7 +135,10 @@ def add_feed(name, url, directory):
     torrent = ''
     feed_data = feedparser.parse(url)
     entries = feed_data.entries
-    e = entries[0]
+    try:
+        e = entries[0]
+    except IndexError:
+        raise click.BadParameter("No entries found for this feed. Please check the URL and try again.")
     for each in e:
         try:
             if e[each].startswith('magnet:'):
@@ -185,10 +188,10 @@ def lister(list_type):
                 enabled = 'Yes'
             else:
                 enabled = "No"
-            feed_list.append([feed.id, feed.name, feed.url, enabled])
+            feed_list.append([feed.id, feed.name, feed.url, feed.download_dir, enabled])
         tab = tabulate(
             feed_list,
-            ['ID', 'Name', 'URL', 'Enabled']
+            ['ID', 'Name', 'URL', 'Download Directory', 'Enabled']
         )
         click.echo(tab)
     elif list_type == 'torrents':
diff --git a/setup.py b/setup.py
index eb02b4f..9ba89f3 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     version="0.1.0",
     license="MIT",
     url="https://github.com/archangelic/cistern",
-    description=("Command line tool for downloading torrents from RSS feeds."),
+    description="Command line tool for downloading torrents from RSS feeds.",
     author="Michael Hancock",
     author_email="michaelhancock89@gmail.com",
     download_url=(
@@ -36,8 +36,6 @@
         'Topic :: Internet',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
-        'Natural Language :: English',
-        'Operating System :: POSIX :: Linux',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',