Untested graceful error handling, fixing #178