diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp
index 151e9c738..b41bcb7d6 100755
--- a/dbcon/joblist/tupleaggregatestep.cpp
+++ b/dbcon/joblist/tupleaggregatestep.cpp
@@ -4212,7 +4212,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
 									f->fInputColumnIndex,
 									f->fOutputColumnIndex,
 									f->fAuxColumnIndex));
-						functionSub2.push_back(funct);
+							functionSub2.push_back(funct);
+						}
 					}
 				}
 			}
diff --git a/utils/udfsdk/median.cpp b/utils/udfsdk/median.cpp
index 2c47896f8..b91d17d4b 100755
--- a/utils/udfsdk/median.cpp
+++ b/utils/udfsdk/median.cpp
@@ -165,6 +165,11 @@ mcsv1_UDAF::ReturnCode median::evaluate(mcsv1Context* context, static_any::any&
 {
 	uint64_t cnt1=0, cnt2=0;
 	MEDIAN_DATA& data = static_cast<MedianData*>(context->getUserData())->mData;
+	if (data.size() == 0)
+	{
+		valOut = (DATATYPE)0;
+		return mcsv1_UDAF::SUCCESS;
+	}
 	MEDIAN_DATA::iterator iter(data.begin());
 	MEDIAN_DATA::iterator revfrom(data.end());
 	MEDIAN_DATA::reverse_iterator riter(revfrom);