From d6afe1b1249741512d78fbef04949c38e10c7f5d Mon Sep 17 00:00:00 2001
From: Tadeu Zagallo <tadeuzagallo@fb.com>
Date: Mon, 20 Apr 2015 11:03:56 -0700
Subject: [PATCH] [ReactNative] Don't break when can't create executor

---
 React/Base/RCTJavaScriptExecutor.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/React/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h
index 2816c7a7a..8ff5a1658 100644
--- a/React/Base/RCTJavaScriptExecutor.h
+++ b/React/Base/RCTJavaScriptExecutor.h
@@ -49,11 +49,13 @@ __used static id<RCTJavaScriptExecutor> RCTCreateExecutor(Class executorClass)
 {
   static NSUInteger executorID = 0;
   id<RCTJavaScriptExecutor> executor = [[executorClass alloc] init];
-  objc_setAssociatedObject(executor, RCTJavaScriptExecutorID, @(++executorID), OBJC_ASSOCIATION_RETAIN);
+  if (executor) {
+    objc_setAssociatedObject(executor, RCTJavaScriptExecutorID, @(++executorID), OBJC_ASSOCIATION_RETAIN);
+  }
   return executor;
 }
 
 __used static NSNumber *RCTGetExecutorID(id<RCTJavaScriptExecutor> executor)
 {
-  return objc_getAssociatedObject(executor, RCTJavaScriptExecutorID);
+  return executor ? objc_getAssociatedObject(executor, RCTJavaScriptExecutorID) : @0;
 }