Added some additional checks for options

Combining thor with settingslogic breaks validation
on configuration options coming from config files.