diff --git a/examples/rich/rich.html b/examples/rich/rich.html
index ef17a98d8a..c35013aeec 100644
--- a/examples/rich/rich.html
+++ b/examples/rich/rich.html
@@ -24,7 +24,17 @@
   </head>
   <body>
     <div id="target"></div>
-    <script src="../../node_modules/react/dist/react.min.js"></script>
+    <div id="sample">
+      <ol>
+        <li>foo</li>
+        <li>bar</li>
+        <li>baz</li>
+      </ol>
+      <p>
+        And some more content.
+      </p>
+    </div>
+    <script src="../../node_modules/react/dist/react.js"></script>
     <script src="../../node_modules/react-dom/dist/react-dom.js"></script>
     <script src="../../node_modules/immutable/dist/immutable.js"></script>
     <script src="../../node_modules/es6-shim/es6-shim.js"></script>
diff --git a/src/component/selection/setDraftEditorSelection.js b/src/component/selection/setDraftEditorSelection.js
index f4ce80286d..cbe5159c24 100644
--- a/src/component/selection/setDraftEditorSelection.js
+++ b/src/component/selection/setDraftEditorSelection.js
@@ -125,24 +125,28 @@ function addFocusToSelection(
   node: Node,
   offset: number
 ): void {
-  if (selection.extend && containsNode(getActiveElement(), node)) {
-    // If `extend` is called while another element has focus, an error is
-    // thrown. We therefore disable `extend` if the active element is somewhere
-    // other than the node we are selecting. This should only occur in Firefox,
-    // since it is the only browser to support multiple selections.
-    // See https://bugzilla.mozilla.org/show_bug.cgi?id=921444.
-    selection.extend(node, offset);
-  } else {
-    // IE doesn't support extend. This will mean no backward selection.
-    // Extract the existing selection range and add focus to it.
-    // Additionally, clone the selection range. IE11 throws an
-    // InvalidStateError when attempting to access selection properties
-    // after the range is detached.
-    if (selection.rangeCount > 0) {
-      var range = selection.getRangeAt(0);
-      range.setEnd(node, offset);
-      selection.addRange(range.cloneRange());
+  try {
+    if (selection.extend && containsNode(getActiveElement(), node)) {
+      // If `extend` is called while another element has focus, an error is
+      // thrown. We therefore disable `extend` if the active element is somewhere
+      // other than the node we are selecting. This should only occur in Firefox,
+      // since it is the only browser to support multiple selections.
+      // See https://bugzilla.mozilla.org/show_bug.cgi?id=921444.
+      selection.extend(node, offset);
+    } else {
+      // IE doesn't support extend. This will mean no backward selection.
+      // Extract the existing selection range and add focus to it.
+      // Additionally, clone the selection range. IE11 throws an
+      // InvalidStateError when attempting to access selection properties
+      // after the range is detached.
+      if (selection.rangeCount > 0) {
+        var range = selection.getRangeAt(0);
+        range.setEnd(node, offset);
+        selection.addRange(range.cloneRange());
+      }
     }
+  } catch (e) {
+    console.warn('failed to add focus to selection', e, selection, node, offset);
   }
 }
 
@@ -151,12 +155,16 @@ function addPointToSelection(
   node: Node,
   offset: number
 ): void {
-  var range = document.createRange();
-  range.setStart(node, offset);
-  selection.addRange(range);
-  // Taken from https://github.com/facebook/draft-js/pull/1190
-  if (selection.rangeCount === 0) {
+  try {
+    var range = document.createRange();
+    range.setStart(node, offset);
     selection.addRange(range);
+    // Taken from https://github.com/facebook/draft-js/pull/1190
+    if (selection.rangeCount === 0) {
+      selection.addRange(range);
+    }
+  } catch (e) {
+    console.warn('failed to add point to selection', e, selection, node, offset);
   }
 }
 
