diff --git a/components/net/storage_task.rs b/components/net/storage_task.rs
index 215d451a9ab..8aeceb3dd77 100644
--- a/components/net/storage_task.rs
+++ b/components/net/storage_task.rs
@@ -133,9 +133,9 @@ impl StorageManager {
     fn remove_item(&mut self, sender: Sender<Option<DOMString>>, url: Url, storage_type: StorageType, name: DOMString) {
         let origin = self.get_origin_as_string(url);
         let data = self.select_data_mut(storage_type);
-        let old_value = data.get_mut(&origin).map(|entry| {
+        let old_value = data.get_mut(&origin).and_then(|entry| {
             entry.remove(&name)
-        }).unwrap();
+        });
         sender.send(old_value).unwrap();
     }