As per the other related PR, let's get this into options_parsing as that is a more logical location for validation of inputs.