auto merge of #4859 : glennw/servo/fix-3986, r=larsbergstrom

1 files changed, 6 insertions, 4 deletions

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 0c0377adf28..0f3f5c1b564 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -753,9 +753,10 @@ impl ScriptTask {
         }
 
         // otherwise find just the matching page and exit all sub-pages
-        match page.remove(id) {
+        match page.find(id) {
             Some(ref mut page) => {
                 shut_down_layout(&*page, (*self.js_runtime).ptr, exit_type);
+                page.remove(id);
                 false
             }
             // TODO(tkuehn): pipeline closing is currently duplicated across
@@ -1321,8 +1322,9 @@ fn shut_down_layout(page_tree: &Rc<Page>, rt: *mut JSRuntime, exit_type: Pipelin
         // processed this message.
         let (response_chan, response_port) = channel();
         let LayoutChan(ref chan) = page.layout_chan;
-        chan.send(layout_interface::Msg::PrepareToExit(response_chan)).unwrap();
-        response_port.recv().unwrap();
+        if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() {
+          response_port.recv().unwrap();
+        }
     }
 
     // Remove our references to the DOM objects in this page tree.
@@ -1344,7 +1346,7 @@ fn shut_down_layout(page_tree: &Rc<Page>, rt: *mut JSRuntime, exit_type: Pipelin
     // Destroy the layout task. If there were node leaks, layout will now crash safely.
     for page in page_tree.iter() {
         let LayoutChan(ref chan) = page.layout_chan;
-        chan.send(layout_interface::Msg::ExitNow(exit_type)).unwrap();
+        chan.send(layout_interface::Msg::ExitNow(exit_type)).ok();
     }
 }