improve exception method
Revert "improve exception method"

This reverts commit 579cf2e17055ab13ca498518066dd1c69269d62b.
improve exception method