diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
index eff5d6878bf00..1eea4b7b5ea63 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
@@ -159,7 +159,7 @@ trait CheckAnalysis extends PredicateHelper {
             failAnalysis("grouping_id() can only be used with GroupingSets/Cube/Rollup")
 
           case Alias(w: WindowFunction, _) =>
-            failAnalysis(s"Expression '$w' not supported without a window function.")
+            failAnalysis(s"Window function '$w' call requires an OVER clause.")
 
           case w @ WindowExpression(AggregateExpression(_, _, true, _, _), _) =>
             failAnalysis(s"Distinct window functions are not supported: $w")
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala
index c17d28d71b84d..30c6eb0410a49 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala
@@ -829,6 +829,6 @@ class AnalysisSuite extends AnalysisTest with Matchers {
 
   test("throw user facing error when use WindowFunction directly") {
     assertAnalysisError(testRelation2.select(RowNumber()),
-      Seq("Expression 'row_number()' not supported without a window function."))
+      Seq("Window function 'row_number()' call requires an OVER clause."))
   }
 }