am c4faa0c4: Merge "Fix confusing error messages." into lmp-mr1-dev

* commit 'c4faa0c419a5b88fec40df901579efbf12e60a26':
  Fix confusing error messages.