Validate the on-off options.
Merge branch 'more-validation'