Adapt to new exception message.

Simplify formatting (use "%r" % x instead of "%s" % repr(x)).