Fixed issues with @error and @success messages