MDL-68070 messaging: Ensure that error is shown on first messages