From 8577600a61a0d2e4712f86782a43daa5ce385e84 Mon Sep 17 00:00:00 2001
From: Trevor Smith <trevorlynnsmith@gmail.com>
Date: Thu, 7 Apr 2016 16:42:50 -0600
Subject: [PATCH] Add a null check when checking for the native parent of an
 option element.

---
 src/renderers/dom/client/wrappers/ReactDOMOption.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderers/dom/client/wrappers/ReactDOMOption.js b/src/renderers/dom/client/wrappers/ReactDOMOption.js
index a7e479d7e7..221f8fc004 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMOption.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMOption.js
@@ -39,7 +39,7 @@ var ReactDOMOption = {
         selectParent = selectParent._nativeParent;
       }
 
-      if (selectParent._tag === 'select') {
+      if (selectParent != null && selectParent._tag === 'select') {
         selectValue = ReactDOMSelect.getSelectValueContext(selectParent);
       }
     }