improved error handling
1.1.1