Fix #38 by shortening messages.

See #38 for details.