diff --git a/comictagger.py b/comictagger.py
index c12363c..3c98495 100755
--- a/comictagger.py
+++ b/comictagger.py
@@ -1,4 +1,4 @@
 #!/usr/bin/python
 from comictaggerlib.main import ctmain
 
-ctmain()			
+ctmain()
diff --git a/comictaggerlib/options.py b/comictaggerlib/options.py
index 046aa3d..0b15c7b 100644
--- a/comictaggerlib/options.py
+++ b/comictaggerlib/options.py
@@ -289,7 +289,8 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 				self.file_list = []
 				for item in args:
 					self.file_list.extend(glob.glob(item))
-				self.filename = self.file_list[0]
+				if len(self.file_list) > 0:
+					self.filename = self.file_list[0]
 			else:
 				self.filename = args[0]
 				self.file_list = args