Merge "fix reduce log spam on errors"