diff --git a/spec/models/metadata_spec.rb b/spec/models/metadata_spec.rb
index 889162cb..d0c03d0b 100644
--- a/spec/models/metadata_spec.rb
+++ b/spec/models/metadata_spec.rb
@@ -136,6 +136,17 @@
           wibble_pt: 100
         })
       end
+
+      context "nil keys" do
+        let(:exif) { { nil => nil, "test" => 100 } }
+
+        it "returns an underscore-keyed array without the nil keys" do
+          hash = metadata.send(:fetch_from_exif, exif, [:test])
+          hash.should eq({
+            test: 100
+          })
+        end
+      end
     end
 
     describe "#rotate?" do