adopted-ember-addons
diff --git a/‎addon/utils/merge-deep.js‎
Lines changed: 1 addition & 1 deletion b/‎addon/utils/merge-deep.js‎
Lines changed: 1 addition & 1 deletion
@@ -5,7 +5,7 @@ function isMergeableObject(value) {
 }
 
 function isNonNullObject(value) {
-  return !!value && typeof value === 'object';
+  return !!value && typeof value === 'object' && value !== null;
 }
 
 function isSpecial(value) {
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ function isMergeableObject(value) {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`function isNonNullObject(value) {`
`8`		`- return !!value && typeof value === 'object';`
	`8`	`+ return !!value && typeof value === 'object' && value !== null;`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`function isSpecial(value) {`