diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs
index bc8785b45acf..7fb1aabb1fe4 100644
--- a/src/libcore/pipes.rs
+++ b/src/libcore/pipes.rs
@@ -899,7 +899,10 @@ struct port_set<T: send> : recv<T> {
     }
 
     fn recv() -> T {
-        option::unwrap(self.try_recv())
+        match move self.try_recv() {
+            some(x) { move x }
+            none { fail ~"port_set: endpoints closed" }
+        }
     }
 
     pure fn peek() -> bool {