Backport MB-29528 Eventing error messages inconsistency
MB-29528 Eventing error messages inconsistency