diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/max/MaxAggFunctionFactory.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/max/MaxAggFunctionFactory.java
index 5f5df6297e4b..22fca79cca06 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/max/MaxAggFunctionFactory.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/max/MaxAggFunctionFactory.java
@@ -54,7 +54,7 @@ public KsqlAggregateFunction createAggregateFunction(
       case TIMESTAMP:
         return new MaxKudaf(FUNCTION_NAME, initArgs.udafIndex(), argSchema);
       default:
-        throw new KsqlException("No MAX aggregate function with " + argTypeList.get(0) + " "
+        throw new KsqlException("No " + FUNCTION_NAME + " aggregate function with " + argTypeList.get(0) + " "
             + "argument type exists!");
 
     }
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/min/MinAggFunctionFactory.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/min/MinAggFunctionFactory.java
index f37a59d5a733..3e77429c3f9c 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/min/MinAggFunctionFactory.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/min/MinAggFunctionFactory.java
@@ -53,7 +53,7 @@ public KsqlAggregateFunction createAggregateFunction(
       case TIMESTAMP:
         return new MinKudaf(FUNCTION_NAME, initArgs.udafIndex(), argSchema);
       default:
-        throw new KsqlException("No MIN aggregate function with " + argTypeList.get(0) + " "
+        throw new KsqlException("No " + FUNCTION_NAME + " aggregate function with " + argTypeList.get(0) + " "
             + "argument type exists!");
 
     }
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/sum/SumAggFunctionFactory.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/sum/SumAggFunctionFactory.java
index d8887cb3102e..843b3b058dfc 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/sum/SumAggFunctionFactory.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/sum/SumAggFunctionFactory.java
@@ -55,7 +55,7 @@ public KsqlAggregateFunction createAggregateFunction(
       case DECIMAL:
         return new DecimalSumKudaf(FUNCTION_NAME, initArgs.udafIndex(), (SqlDecimal) argSchema);
       default:
-        throw new KsqlException("No Max aggregate function with " + argTypeList.get(0) + " "
+        throw new KsqlException("No " + FUNCTION_NAME + " aggregate function with " + argTypeList.get(0) + " "
             + " argument type exists!");
 
     }
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topk/TopKAggregateFunctionFactory.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topk/TopKAggregateFunctionFactory.java
index 6693ecc62084..5378fa09e89a 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topk/TopKAggregateFunctionFactory.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topk/TopKAggregateFunctionFactory.java
@@ -92,8 +92,8 @@ public KsqlAggregateFunction createAggregateFunction(
             Collections.singletonList(ParamTypes.STRING),
             String.class);
       default:
-        throw new KsqlException("No TOPK aggregate function with " + argumentType.get(0)
-            + " argument type exists!");
+        throw new KsqlException("No " + FUNCTION_NAME + " aggregate function with " + argTypeList.get(0) + " "
+            + "argument type exists!");
     }
   }
 
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topkdistinct/TopkDistinctAggFunctionFactory.java b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topkdistinct/TopkDistinctAggFunctionFactory.java
index 36b8ed570705..d94b8ea4b254 100644
--- a/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topkdistinct/TopkDistinctAggFunctionFactory.java
+++ b/ksqldb-engine/src/main/java/io/confluent/ksql/function/udaf/topkdistinct/TopkDistinctAggFunctionFactory.java
@@ -69,7 +69,7 @@ public KsqlAggregateFunction createAggregateFunction(
             SchemaConverters.sqlToFunctionConverter().toFunctionType(argSchema),
             SchemaConverters.sqlToJavaConverter().toJavaType(argSchema));
       default:
-        throw new KsqlException("No TOPKDISTINCT aggregate function with " + argTypeList.get(0)
+        throw new KsqlException("No " + FUNCTION_NAME + " aggregate function with " + argTypeList.get(0) + " "
             + " argument type exists!");
     }
   }