simpler error handling
1.4.0