improved some error messages