am a21bf6e7: Merge "Clarify a confusing error message."

* commit 'a21bf6e7f64f142f371707c9a06aefdb1d383b5a':
  Clarify a confusing error message.