diff --git a/src/rustc/middle/check_loop.rs b/src/rustc/middle/check_loop.rs
index 8f3de8c8aa2d..dad51ed48b4b 100644
--- a/src/rustc/middle/check_loop.rs
+++ b/src/rustc/middle/check_loop.rs
@@ -40,7 +40,7 @@ fn check_crate(tcx: ty::ctxt, crate: @crate) {
               }
               expr_ret(oe) => {
                 if !cx.can_ret {
-                    tcx.sess.span_err(e.span, ~"`ret` in block function");
+                    tcx.sess.span_err(e.span, ~"`return` in block function");
                 }
                 visit::visit_expr_opt(oe, cx, v);
               }
diff --git a/src/test/compile-fail/return-in-block-function.rs b/src/test/compile-fail/return-in-block-function.rs
new file mode 100644
index 000000000000..b828477bdc9f
--- /dev/null
+++ b/src/test/compile-fail/return-in-block-function.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let _x = || {
+        return //~ ERROR: `return` in block function
+    };
+}