diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index 8ea5a5d4b..c8eeb3c30 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -168,7 +168,7 @@ sub submit_request {
 
       #add ESC back
       foreach my $key (keys %$rsp) {
-	  if (ref($rsp->{$key}) eq 'ARRAY') { foreach my $text (@{$rsp->{$key}}) { $text =~ s/xxxxESCxxxx/\e/g; } }
+	  if (ref($rsp->{$key}) eq 'ARRAY') { foreach my $text (@{$rsp->{$key}}) { next unless defined $text; $text =~ s/xxxxESCxxxx/\e/g; } }
 	  else { $rsp->{$key} =~ s/xxxxESCxxxx/\e/g; }
       }
 	  
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index 6c34e2b88..f529f885d 100644
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -1425,6 +1425,7 @@ sub dohyp {
       $output{node}->[0]->{errorcode} = $rc;
       $output{node}->[0]->{name}->[0]=$node;
       $output{node}->[0]->{data}->[0]->{contents}->[0]=$text;
+      $output{node}->[0]->{error} = $text unless $rc == 0;
       print $out freeze([\%output]);
       print $out "\nENDOFFREEZE6sK4ci\n";
       yield();