3 files changed, 11 insertions, 4 deletions
diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs
index 449df8cddea..2daa64e8085 100644
--- a/src/libstd/rt/io/net/tcp.rs
+++ b/src/libstd/rt/io/net/tcp.rs
@@ -380,7 +380,7 @@ mod test {
             }
 
             do spawntask {
-                for max.times {
+                do max.times {
                     let mut stream = TcpStream::connect(addr);
                     stream.write([99]);
                 }
@@ -405,7 +405,7 @@ mod test {
             }
 
             do spawntask {
-                for max.times {
+                do max.times {
                     let mut stream = TcpStream::connect(addr);
                     stream.write([99]);
                 }
diff --git a/src/libstd/rt/local.rs b/src/libstd/rt/local.rs
index 71e60a6a923..7ab63233cff 100644
--- a/src/libstd/rt/local.rs
+++ b/src/libstd/rt/local.rs
@@ -44,7 +44,13 @@ impl Local for Task {
         }
     }
     unsafe fn unsafe_borrow() -> *mut Task { local_ptr::unsafe_borrow() }
-    unsafe fn try_unsafe_borrow() -> Option<*mut Task> { rtabort!("unimpl task try_unsafe_borrow") }
+    unsafe fn try_unsafe_borrow() -> Option<*mut Task> {
+        if Local::exists::<Task>() {
+            Some(Local::unsafe_borrow())
+        } else {
+            None
+        }
+    }
 }
 
 impl Local for Scheduler {
@@ -95,7 +101,7 @@ impl Local for Scheduler {
         }
     }
     unsafe fn try_unsafe_borrow() -> Option<*mut Scheduler> {
-        if Local::exists::<Task>() {
+        if Local::exists::<Scheduler>() {
             Some(Local::unsafe_borrow())
         } else {
             None
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index fcc6ebeada6..23a0d28e457 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -129,6 +129,7 @@ impl Task {
             death: Death::new(),
             destroyed: false,
             coroutine: Some(Coroutine::empty()),
+            name: None,
             sched: None,
             task_type: SchedTask
         }