diff --git a/lib/paperclip/io_adapters/uri_adapter.rb b/lib/paperclip/io_adapters/uri_adapter.rb
index 51d2e1192..268cb4a0b 100644
--- a/lib/paperclip/io_adapters/uri_adapter.rb
+++ b/lib/paperclip/io_adapters/uri_adapter.rb
@@ -29,8 +29,9 @@ def content_type_from_content
 
     def filename_from_content_disposition
       if @content.meta.has_key?("content-disposition")
-        @content.meta["content-disposition"].
-          match(/filename="([^"]*)"/)[1]
+        matches = @content.meta["content-disposition"].
+          match(/filename="([^"]*)"/)
+        matches[1] if matches
       end
     end