improve the error handling, v1.3.0