Improvements to error and success messages.