Merge "Quote error messages"