Improved error message content