Improved error messages <Karthik>