diff --git a/src/flask/app.py b/src/flask/app.py
index c2208f14..7472df8d 100644
--- a/src/flask/app.py
+++ b/src/flask/app.py
@@ -2078,9 +2078,9 @@ class Flask(_PackageBoundObject):
         # the body must not be None
         if rv is None:
             raise TypeError(
-                "The view function did not return a valid response. The"
+                'The view function for "{}" did not return a valid response. The'
                 " function either returned None or ended without a return"
-                " statement."
+                " statement.".format(request.endpoint)
             )
 
         # make sure the body is an instance of the response class
diff --git a/tests/test_basic.py b/tests/test_basic.py
index 8ebdaba4..1022d3c9 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -1221,6 +1221,7 @@ def test_response_type_errors():
     with pytest.raises(TypeError) as e:
         c.get("/none")
         assert "returned None" in str(e.value)
+        assert "from_none" in str(e.value)
 
     with pytest.raises(TypeError) as e:
         c.get("/small_tuple")