diff --git a/packages/ember-metal/lib/meta.js b/packages/ember-metal/lib/meta.js
index c5351c814fe..68ff2298706 100644
--- a/packages/ember-metal/lib/meta.js
+++ b/packages/ember-metal/lib/meta.js
@@ -326,7 +326,7 @@ export class Meta {
   }
 
   peekWatching(subkey) {
-   return this._findInherited('_watching', subkey);
+    return this._findInherited('_watching', subkey);
   }
 
   writeMixins(subkey, value) {
diff --git a/packages/ember-metal/lib/property_set.js b/packages/ember-metal/lib/property_set.js
index 7bc2c534ed3..4ae71b63fc8 100644
--- a/packages/ember-metal/lib/property_set.js
+++ b/packages/ember-metal/lib/property_set.js
@@ -5,7 +5,6 @@ import {
   propertyWillChange,
   propertyDidChange
 } from './property_events';
-
 import {
   isPath
 } from './path_cache';
@@ -101,10 +100,9 @@ function setPath(root, path, value, tolerant) {
   assert('Property set failed: You passed an empty path', keyName.trim().length > 0);
 
   let newPath = parts.join('.');
-
   let newRoot = getPath(root, newPath);
 
-  if (newRoot) {
+  if (newRoot !== null && newRoot !== undefined) {
     return set(newRoot, keyName, value);
   } else if (!tolerant) {
     throw new EmberError(`Property set failed: object in path "${newPath}" could not be found or was destroyed.`);