Improve some error messages #289 #290