fix a bug and beautify customer error