diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index d2f8e00a2..139d945fd 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -2,7 +2,7 @@
 #
 # go-xcat - Install xCAT automatically.
 #
-# Version 1.0.34
+# Version 1.0.36
 #
 # Copyright (C) 2016, 2017, 2018 International Business Machines
 # Eclipse Public License, Version 1.0 (EPL-1.0)
@@ -21,6 +21,8 @@
 # 2018-09-28 GONG Jie <gongjie@linux.vnet.ibm.com>
 #     - Revised debug log
 #     - xCAT uninstallation
+# 2019-03-22 GONG Jie <gongjie@linux.vnet.ibm.com>
+#     - Better debug log when reading repository failed
 #
 
 function usage()
@@ -1976,13 +1978,9 @@ do
 		exit_if_bad "$?" "Try \`$0 --help' for more information"
 		GO_XCAT_ACTION="$1"
 		case "$1 $2" in
-		"completely uninstall")
+		"completely uninstall"|"smoke test")
 			shift
-			GO_XCAT_ACTION="away"
-			;;
-		"smoke test")
-			shift
-			GO_XCAT_ACTION="smoke test"
+			GO_XCAT_ACTION="$1 $2"
 			;;
 		esac
 		;;
@@ -1991,7 +1989,13 @@ do
 done
 
 case "${GO_XCAT_ACTION}" in
-"away"|"check"|"install"|"uninstall"|"update")
+"away")
+	GO_XCAT_YES=("-y")
+	;;
+"completely uninstall")
+	GO_XCAT_ACTION="away"
+	;;
+"check"|"install"|"uninstall"|"update")
 	;;
 "smoke test")
 	smoke_testing
@@ -2120,7 +2124,7 @@ if [[ "${RET}" -ne 0 ]]
 then
 	echo "failed"
 	echo "${ERR_MSG}" >&2
-	exit "${RET}"
+	boo_boo_if_bad "${RET}"
 fi
 echo "done"