Improve validation for invoker management

No match.