Config field fallback if null
Merge pull request #25 from ed47/DCSwiss

Config field fallback if null