Handle exceptions better
0.2.6