TRUNK-4322 - Simplified error message format

Applying auto format changes