Revised error handling functionality based on 2012-12-11 telecon discussion.
This affects issue #153.