Fix for when the new config variables are not defined
Merge pull request #44 from richard-green/master

Fix for when the new config variables are not defined