Enhance error messages