0.0.5 and new error handling