Merge "Don't abort on errors"