Better error handling
0.5.1