diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 6082a5c14..8feb74dcb 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -671,10 +671,14 @@ sub plugin_command {
         unless (@nodes) { #register the plugin in the event of usage
           $handler_hash{$ownmod} = 1;
         }
-        my $hdlrcache = $hdlrtable->getNodesAttribs(\@nodes,\@columns);
+        my $hdlrcache;
+	if ($hdlrtable) {
+        	$hdlrcache = $hdlrtable->getNodesAttribs(\@nodes,\@columns);
+	}
         foreach $node (@nodes) {
+	  unless ($hdlrcache) { next; }
           my $attribs = $hdlrcache->{$node}->[0]; #$hdlrtable->getNodeAttribs($node,\@columns);
-          unless (defined($attribs)) { next; } #TODO: This really ought to craft an unsupported response for this request
+          unless (defined($attribs)) { next; } 
           foreach (@columns) {
             my $col=$_;
             if (defined($attribs->{$col})) {