Better error handling, v0.3.0