diff --git a/src/core/ReactMount.js b/src/core/ReactMount.js
index 600d720da8..e07e209be7 100644
--- a/src/core/ReactMount.js
+++ b/src/core/ReactMount.js
@@ -196,10 +196,14 @@ var ReactMount = {
   unmountAndReleaseReactRootNode: function(container) {
     var reactRootID = getReactRootID(container);
     var component = instanceByReactRootID[reactRootID];
-    // TODO: Consider throwing if no `component` was found.
-    component.unmountComponentFromNode(container);
-    delete instanceByReactRootID[reactRootID];
-    delete containersByReactRootID[reactRootID];
+    if (component) {
+      component.unmountComponentFromNode(container);
+      delete instanceByReactRootID[reactRootID];
+      delete containersByReactRootID[reactRootID];
+      return true;
+    } else {
+      return false;
+    }
   },
 
   /**