Looks good. Our usual idiom here would be `!error` instead of `error == 0` - would you update that? Then I think this is good to merge. Nice catch!