diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl
index cada0681b167e0c69d3e6fd08007461ca5581d40..010ab096eecba93f5ee62faa4405cf68a432c98a 100755
--- a/src/warden-server/bin/registerReceiver.pl
+++ b/src/warden-server/bin/registerReceiver.pl
@@ -90,6 +90,8 @@ sub trim
 #-------------------------------------------------------------------------------
 our ($opt_n, $opt_r, $opt_t, $opt_o, $opt_i, $opt_h);
 
+if ($#ARGV == -1) {usage}
+
 die usage unless getopts("n:r:t:i:ho");
 my $hostname            = $opt_n;
 my $requestor           = $opt_r;
@@ -109,9 +111,7 @@ if ($help) {
 
 # superuser controle
 my $UID = $<;
-if ($UID != 0) {
-	  die errMsg("You must be root for running this script!")
-}
+if ($UID != 0) {die errMsg("You must be root for running this script!")}
 
 # check parameters definition
 switch () {
diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl
index 053c1f772c9bccc5f118b3793d95bdebaecf09cd..ae31af73a98153db2a21cbcd38cb6520e2de6f86 100755
--- a/src/warden-server/bin/registerSender.pl
+++ b/src/warden-server/bin/registerSender.pl
@@ -89,6 +89,8 @@ sub trim
 #-------------------------------------------------------------------------------
 our ($opt_n, $opt_r, $opt_s, $opt_d, $opt_i, $opt_h);
 
+if ($#ARGV == -1) {usage}
+
 die usage unless getopts("n:r:s:d:i:h");
 my $hostname		= $opt_n;
 my $requestor		= $opt_r;
@@ -104,9 +106,7 @@ if ($help) {
 
 # superuser controle
 my $UID = $<;
-if ($UID != 0) {
-	  die errMsg("You must be root for running this script!")
-}
+if ($UID != 0) {die errMsg("You must be root for running this script!")}
 
 # check parameters definition
 switch () {
diff --git a/src/warden-server/bin/unregisterClient.pl b/src/warden-server/bin/unregisterClient.pl
index 028f2ecc4eb7372964440479d16a8663f3c2fe73..254971285168c52d97e2b7c125e0d5f1a1b861ac 100755
--- a/src/warden-server/bin/unregisterClient.pl
+++ b/src/warden-server/bin/unregisterClient.pl
@@ -85,6 +85,8 @@ sub trim
 #-------------------------------------------------------------------------------
 our ($opt_h, $opt_i);
 
+if ($#ARGV == -1) {usage}
+
 die usage unless getopts("i:h");
 my $client_id	= $opt_i;
 my $help        = $opt_h;
@@ -96,9 +98,7 @@ if ($help) {
 
 # superuser controle
 my $UID = $<;
-if ($UID != 0) {
-	  die errMsg("You must be root for running this script!")
-}
+if ($UID != 0) {die errMsg("You must be root for running this script!")}
 
 # check parameters definition
 if (!defined $client_id) {