Merge "Fix error message being cut off."