diff --git a/fanficfare/cli.py b/fanficfare/cli.py
index 5d36f01c..14374df2 100644
--- a/fanficfare/cli.py
+++ b/fanficfare/cli.py
@@ -217,10 +217,10 @@ def main(argv=None,
     if options.infile:
         with open(options.infile,"r") as infile:
             #print "File exists and is readable"
-
-            #fileurls = [line.strip() for line in infile]
             for url in infile:
-                url = url[:url.find('#')].strip()
+                if '#' in url:
+                    url = url[:url.find('#')].strip()
+                url = url.strip()
                 if len(url) > 0:
                     #print "URL: (%s)"%url
                     urls.append(url)