Merge "Replace parsing error stack dump with a more terse message"