diff --git a/xCAT-client/bin/xcatclient b/xCAT-client/bin/xcatclient
index 556010062..d721a8cb1 100755
--- a/xCAT-client/bin/xcatclient
+++ b/xCAT-client/bin/xcatclient
@@ -89,7 +89,9 @@ if ($arg ne "NO_NODE_RANGE") {
   $arg = join(',',@tempnr);
   $cmdref->{noderange}->[0]=$arg;
 }
-push (@{$cmdref->{arg}}, @ARGV);
+if (@ARGV) {
+    push (@{$cmdref->{arg}}, @ARGV);
+}
 foreach (keys %ENV) {
     if (/^XCAT_/) {
         $cmdref->{environment}->{$_} = $ENV{$_};
diff --git a/xCAT-client/bin/xcatclientnnr b/xCAT-client/bin/xcatclientnnr
index f369da9b7..c2a136c14 100755
--- a/xCAT-client/bin/xcatclientnnr
+++ b/xCAT-client/bin/xcatclientnnr
@@ -41,7 +41,9 @@ else
 }
 
 
-push (@{$cmdref->{arg}}, @ARGV);
+if (@ARGV) {
+    push (@{$cmdref->{arg}}, @ARGV);
+}
 foreach (keys %ENV) {
     if (/^XCAT_/) {
         $cmdref->{environment}->{$_} = $ENV{$_};