diff --git a/buildcore.sh b/buildcore.sh
index c6a665a22..93f21baf4 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -243,6 +243,7 @@ for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xC
 	#if [ "$EMBED" = "zvm" -a "$rpmname" != "xCAT-server" -a "$rpmname" != "xCAT-UI" ]; then continue; fi		# for zvm embedded env only need to build server and UI
 	if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi
 	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi		# do not build xCAT-buildkit on aix
+	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-SoftLayer" ]; then continue; fi		# do not build xCAT-softlayer on aix
 	if $GREP $rpmname $GITUP || [ "$BUILDALL" == 1 ]; then
 		UPLOAD=1
 		maker $rpmname
diff --git a/perl-xCAT/xCAT/InstUtils.pm b/perl-xCAT/xCAT/InstUtils.pm
index 8fcef91fa..ea3f1d7e0 100644
--- a/perl-xCAT/xCAT/InstUtils.pm
+++ b/perl-xCAT/xCAT/InstUtils.pm
@@ -1023,7 +1023,7 @@ sub dolitesetup
         $nrange = join(',',@nodel);
     }
 
-	my @flist = xCAT::Utils->runcmd("/opt/xcat/bin/litefile $nrange", -1);
+	@flist = xCAT::Utils->runcmd("/opt/xcat/bin/litefile $nrange", -1);
     if (scalar(@flist) > 0) {
         foreach my $l (@flist) {
 			my ($j1, $j2, $file) = split /\s+/, $l;
diff --git a/perl-xCAT/xCAT/TableUtils.pm b/perl-xCAT/xCAT/TableUtils.pm
index daacc6e28..bf3adfef3 100644
--- a/perl-xCAT/xCAT/TableUtils.pm
+++ b/perl-xCAT/xCAT/TableUtils.pm
@@ -429,7 +429,6 @@ rmdir \"/tmp/$to_userid\" \n";
       # Need to check if nodes are in a zone.  
       my @zones;
       my $tab = xCAT::Table->new("zone"); 
-      my @zones; 
       if ($tab) 
       {
           # if we have zones, need to send the zone keys to each node in the zone
@@ -623,7 +622,7 @@ sub sendkeysTOzones
       my ($class, $ref_nodes,$expecttimeout) = @_;
       my @nodes=$ref_nodes;
       my $n_str    = $nodes[0];
-      my @nodes=  split(",", $n_str);
+      @nodes=  split(",", $n_str);
       my $rsp = ();
       my $cmd;
       my $roothome = xCAT::Utils->getHomeDir("root");
diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 77afb7218..a2da8b590 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -154,6 +154,13 @@ sub preprocess_request
     #	- either the NIMprime attr of the site table or the management node
     my $nimprime = xCAT::InstUtils->getnimprime();
     chomp $nimprime;
+    if (!defined($nimprime))
+    {
+       my $rsp={};
+       $rsp->{error}->[0] = "Could not determine nimprime. Check if nimprime defined in site table or site table master is not resolvable to the MN name.";
+       xCAT::MsgUtils->message("E", $rsp, $cb,1);
+       return undef;
+    }
     my $nimprimeip = xCAT::NetworkUtils->getipaddr($nimprime);
     if ($nimprimeip =~ /:/) #IPv6
     {
@@ -4233,7 +4240,7 @@ sub mk_spot
             if ($::RUNCMD_RC != 0)
             {
                 my $rsp;
-			    push @{$rsp->{data}}, " The cpcosi command failed. \n$output\n";
+				push @{$rsp->{data}}, " The cpcosi command failed. \n$output\n";
                 push @{$rsp->{data}},
                   "Could not create a NIM definition for \'$spot_name\'.\n";
                 xCAT::MsgUtils->message("E", $rsp, $callback);