diff --git a/entity/DistrictChangeValidityDates_entity/DistrictChangeValidityDates_entity.aod b/entity/DistrictChangeValidityDates_entity/DistrictChangeValidityDates_entity.aod
index 637eb09c2a57e23bac87783ef1f1e532db08ce16..f9f325ed96548f1f2104908fc940710a59a28a5e 100644
--- a/entity/DistrictChangeValidityDates_entity/DistrictChangeValidityDates_entity.aod
+++ b/entity/DistrictChangeValidityDates_entity/DistrictChangeValidityDates_entity.aod
@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
   <name>DistrictChangeValidityDates_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <onValidation>%aditoprj%/entity/DistrictChangeValidityDates_entity/onValidation.js</onValidation>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/DistrictChangeValidityDates_entity/entityfields/count/valueProcess.js b/entity/DistrictChangeValidityDates_entity/entityfields/count/valueProcess.js
index 9f4f98e036a12bc8869a4a8d7bf75648a2b31104..b1fe835e039657898b2d190167a4338c26848afd 100644
--- a/entity/DistrictChangeValidityDates_entity/entityfields/count/valueProcess.js
+++ b/entity/DistrictChangeValidityDates_entity/entityfields/count/valueProcess.js
@@ -3,7 +3,7 @@ import("system.result");
 
 var districtContactIds = vars.get("$param.DistrictContactIds_param");
 
-if(districtContactIds && Array.isArray(districtContactIds))
+if(districtContactIds)
 {
     result.string(JSON.parse(districtContactIds).length);
 }
diff --git a/entity/DistrictChangeValidityDates_entity/onValidation.js b/entity/DistrictChangeValidityDates_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..11ff32f6ed97d0f204bf0bc4c368bf38317aa0c3
--- /dev/null
+++ b/entity/DistrictChangeValidityDates_entity/onValidation.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+
+var count = vars.get("$field.count");
+if(count == 0)
+{
+    result.string("No Datasets selected");
+}
\ No newline at end of file