am e05bc81c: Merge "We should not throw for non-fatal errors."

* commit 'e05bc81c19838801b91de2642dc275a16dd7cf71':
  We should not throw for non-fatal errors.