Escape exception message
Merge branch '4.0'