Added fix for issue #85, and modified exceptions to avoid doubling
details.