Don't try to use the config unless it has already been loaded
Merge pull request #7 from marlin2/pulls

Don't try to use the config unless it has already been loaded
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x