diff --git a/xCAT-server/lib/xcat/plugins/tabutils.pm b/xCAT-server/lib/xcat/plugins/tabutils.pm
index 91cd61e61..3a5e69e3b 100644
--- a/xCAT-server/lib/xcat/plugins/tabutils.pm
+++ b/xCAT-server/lib/xcat/plugins/tabutils.pm
@@ -266,6 +266,10 @@ sub tabrestore
     }
     $tab->delEntries();    #Yes, delete *all* entries
     my $header = shift @{$request->{data}};
+    unless ($header =~ /^#/) {
+        $cb->({error => "Data missing header line starting with #",errorcode=>1});
+        return;
+    }
     $header =~ s/"//g;     #Strip " from overzealous CSV apps
     $header =~ s/^#//;
     $header =~ s/\s+$//;
diff --git a/xCAT/templates/e1350/noderes.csv b/xCAT/templates/e1350/noderes.csv
index 5decd5b90..3ebe4ee66 100644
--- a/xCAT/templates/e1350/noderes.csv
+++ b/xCAT/templates/e1350/noderes.csv
@@ -1,2 +1,2 @@
-#node,servicenode,netboot,tftpserver,nfsserver,kernel,initrd,kcmdline,nfsdir,serialport,installnic,primarynic,xcatmaster,current_osimage,next_osimage,comments,disable
+#node,servicenode,netboot,tftpserver,nfsserver,nfsdir,installnic,primarynic,xcatmaster,current_osimage,next_osimage,comments,disable
 "compute",,pxe,,