Centralize minion validation

Fixes #2327