diff --git a/xCAT-server-2.0/lib/xcat/plugins/xcat2nim.pm b/xCAT-server-2.0/lib/xcat/plugins/xcat2nim.pm
index 79afa9058..f5ab1960e 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/xcat2nim.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/xcat2nim.pm
@@ -105,7 +105,9 @@ sub process_request
         $rsp->{data}->[0] = $msg;
         $::callback->($rsp);
     }
-    return $ret;
+	if ($ret > 0) {
+		$rsp->{errorcode}->[0] = $ret;
+	}
 }
 
 #----------------------------------------------------------------------------
@@ -140,6 +142,7 @@ sub processArgs
     @ARGV = @{$::args};
 
     # parse the options 
+	Getopt::Long::Configure("no_pass_through");
     if (
         !GetOptions(
                     'all|a'     => \$::opt_a,