[#70291426] refactored error messages to use full message