From 4b5030dbc2d626e678541cdf73feee122bd9c633 Mon Sep 17 00:00:00 2001
From: indexzero <charlie.robbins@gmail.com>
Date: Sun, 20 Sep 2015 01:02:59 -0700
Subject: [PATCH] [fix] Only merge actual objects, not `null` values. Fixes
 #150.

---
 lib/nconf/provider.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
     }