diff --git a/.gitignore b/.gitignore
index 2d88f6b..adbec99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ tmp
 
 ## RUBINIUS
 *.rbc
+
+test.rb
diff --git a/lib/wayback_machine_downloader.rb b/lib/wayback_machine_downloader.rb
index 57a2ded..776f67e 100644
--- a/lib/wayback_machine_downloader.rb
+++ b/lib/wayback_machine_downloader.rb
@@ -78,10 +78,9 @@ class WaybackMachineDownloader
     file_list_curated = Hash.new
     [index_file_list_raw, all_file_list_raw].each do |file|
       file.each_line do |line|
-        next if line.size < 20
         file_timestamp = line[0..13].to_i
         file_url = line[15..-2]
-        file_id = file_url.split('/')[3..-1].join('/')
+        file_id = file_url.split('/')[3..-1].join('/') rescue nil
         file_id = CGI::unescape file_id
         file_id = file_id.tidy_bytes unless file_id == ""
         if file_id.nil?