0.0.5
fixed error handling