Improve error handling for bug #87
Idiomatic error handling for bug #87
More verbose error handling for issue #87
Fix for issue #87