diff --git a/lib/nconf/provider.js b/lib/nconf/provider.js index b346ee9..d35b820 100644 --- a/lib/nconf/provider.js +++ b/lib/nconf/provider.js @@ -250,7 +250,7 @@ Provider.prototype.get = function (key, callback) { response = value; // Merge objects if necessary - if (typeof response === 'object' && !Array.isArray(response)) { + if (response && typeof response === 'object' && !Array.isArray(response)) { mergeObjs.push(response); response = undefined; } @@ -262,7 +262,7 @@ Provider.prototype.get = function (key, callback) { response = store.get(key); // Merge objects if necessary - if (typeof response === 'object' && !Array.isArray(response)) { + if (response && typeof response === 'object' && !Array.isArray(response)) { mergeObjs.push(response); response = undefined; }