diff --git a/compiler/ir1final.lisp b/compiler/ir1final.lisp
index 2d1a5917dac9475ca715d41a7feef2174e476e82..2e12e3bb1ca3a9cbe745d417f95453f7e8da4197 100644
--- a/compiler/ir1final.lisp
+++ b/compiler/ir1final.lisp
@@ -72,8 +72,7 @@
     (functional
      (let* ((where (info function where-from name))
 	    (dtype (leaf-type leaf))
-	    (node (lambda-bind (main-entry leaf)))
-	    (*compiler-error-context* node))
+	    (*compiler-error-context* (lambda-bind (main-entry leaf))))
        (note-name-defined name :function)
 
        (when (function-type-p dtype)
@@ -85,10 +84,6 @@
 	   ((:declared :defined)
 	    ))
 	 
-	 (when (and (eq (function-type-returns dtype) *empty-type*)
-		    (policy node (>= safety brevity)))
-	   (compiler-note "Function does not return."))
-	 
 	 (setf (info function type name) dtype)
 	 (clear-info function assumed-type name))