Better error handling.
0.1.6