Ensure __toString()
catches all error types
#21545
Merged
__toString()
catches all error types
#21545