[fix] Only merge actual objects, not null values. Fixes #150.

indexzero · Sep 20, 2015 · 4b5030d · 4b5030d
1 parent a3589fa
commit 4b5030d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;
     }