diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index d736e4051..3e0dde3bc 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -858,6 +858,17 @@ sub plugin_command {
     unless (@nodes) {
        $req->{emptynoderange} = [1];
     }
+   
+    if(@nodes == 0) {
+        my $rsp = {errorcode=>1,error=>"NO node or noderange specified"};
+        $rsp->{serverdone} = {};
+        if ($sock) {
+            print $sock XMLout($rsp,RootName=>'xcatresponse' ,NoAttr=>1);
+        }
+        return ($rsp);
+
+     }
+
   }
   if (@nodes) { $req->{node} = \@nodes; }
   my %unhandled_nodes;