Slightly improved error messages vs.