improve 2 error messages