Minor misc tidies

The message could presumably be `null`, and might also not indicate what the exception type was? Should we instead do toString() on the error? Same below.