Refining error reporting in #89