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 1155dac28fc78..a986dd5387c38 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
@@ -46,12 +46,11 @@ trait CheckAnalysis {
         operator transformExpressionsUp {
           case a: Attribute if !a.resolved =>
             if (operator.childrenResolved) {
-              val nameParts = a match {
-                case UnresolvedAttribute(nameParts) => nameParts
-                case _ => Seq(a.name)
+              a match {
+                case UnresolvedAttribute(nameParts) =>
+                  // Throw errors for specific problems with get field.
+                  operator.resolveChildren(nameParts, resolver, throwErrors = true)
               }
-              // Throw errors for specific problems with get field.
-              operator.resolveChildren(nameParts, resolver, throwErrors = true)
             }
 
             val from = operator.inputSet.map(_.name).mkString(", ")