Refine error messages [#238]