diff --git a/src/OverlayMixin.js b/src/OverlayMixin.js
index <HASH>..<HASH> 100644
--- a/src/OverlayMixin.js
+++ b/src/OverlayMixin.js
@@ -13,9 +13,11 @@ export default = {
 
   componentWillUnmount: function () {
     this._unrenderOverlay();
-    this.getContainerDOMNode()
-      .removeChild(this._overlayTarget);
-    this._overlayTarget = null;
+    if (this._overlayTarget) {
+      this.getContainerDOMNode()
+        .removeChild(this._overlayTarget);
+      this._overlayTarget = null;
+    }
   },
 
   componentDidUpdate: function () {
@@ -58,4 +60,4 @@ export default = {
     return React.isValidComponent(this.props.container) ?
       this.props.container.getDOMNode() : this.props.container;
   }
-};
\ No newline at end of file
+};
Bugfix for unmounting component with OverlayMixin

Should not try to .removeChild when the target div has not been created yet, browser throws NotFoundError.