Return error on failure
release 0.7.1