diff --git a/perl-xCAT/xCAT/FSPpower.pm b/perl-xCAT/xCAT/FSPpower.pm
index e909ac9cc..0c0e2e9bd 100644
--- a/perl-xCAT/xCAT/FSPpower.pm
+++ b/perl-xCAT/xCAT/FSPpower.pm
@@ -277,13 +277,14 @@ sub powercmd {
         if( $data =~ /Error/) {
             if( $data =~ /Power interval/) {
                 $data = "Error: Invalid powerinterval value in the site table. The valid powerinerval value could be 0 to 300 .";
+	            push @output, [$node_name, $data, -1];
+                next;
+            } elsif ( $data =~ /$node_name/) {
+	            push @output, [$node_name, $data, -1];
+                next;
             }
-	    push @output, [$node_name, $data, -1];
-        } else {
-	    push @output, [$node_name,"Success", 0];
         }
-               
-        
+	    push @output, [$node_name,"Success", 0];
     } 
 
     return( \@output );