Code

cherry-pick/revert: Use error() for failure message