Fixes #61 Possible empty settings
Merge pull request #93 from JN-Jones/fix-61

Fixes #61 Possible empty settings