SSP-2087 added context to error messages
SSP-2088 added message id to error messages