Do some additional option checking earlier