change exception and improve some language
2 files changed