Previously it would wait 1 second for all messages. This proved to be
too short on some platforms. Now it waits up to 30 seconds for 30
messages, then 1 additional second for the message that causes the
error.

The concurrency constructs used may not be the best, but they seem to
work.