improve some error messages including for #611