improved error messages marginally.