Polish error handling
1.0.1