This also cleans up some error messages that were adding lots of
newlines to the end of errors as they passed through the system.