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