CLI: Minor fixes in log and error messages.
CLI: Minor fixes in log and error messages.

ongjohn/LibSWD,cedar-renjun/LibSWD,shangdawei/LibSWD,cedar-renjun/LibSWD,ongjohn/LibSWD,cedar-renjun/LibSWD,ongjohn/LibSWD,shangdawei/LibSWD,shangdawei/LibSWD