Better error handling
0.0.4 version