Merge "Less confusing error message."