improved error handling
0.1.1