TRUNK-2119 Improve Crash Reporting

Replaced all hard coded text with messages