Sometimes (eg parallel), self.message is None, which makes the exception unprintable.
Merge branch '1.9' into 1.10
Merge branch '1.10'