diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl
index 891d2a08d4caaeb8a0e891133020928f1da4600e..cfa93b0be98fde6fc5cc0e26fbbd658f1a45fe41 100755
--- a/src/warden-server/bin/registerReceiver.pl
+++ b/src/warden-server/bin/registerReceiver.pl
@@ -120,9 +120,15 @@ switch () {
   case {!defined $ip_net_client} 	{WardenCommon::errMsg("Parameter '-c <cidr>' is not defined!")}
 }
 
+# check if type of event is allowed in validation hash
+my @valid_types = $WardenCommon::VALID_STRINGS{"type"};
+if (!($type ~~ @valid_types)) {
+  WardenCommon::errMsg("Unsupported type of events: '$type'!");
+}
+
 # check validity of IP address (CIDR format)
 if ($ip_net_client !~ /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(\d|[1-2]\d|3[0-2]))$/) {
-  WardenCommon::errMsg("Enter correct IP address in CIDR format!");
+  WardenCommon::errMsg("Incorrect CIDR format of IP address: '$ip_net_client'!");
 }
 
 # check client ID