diff --git a/React/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h index 2816c7a7a81..8ff5a16585d 100644 --- a/React/Base/RCTJavaScriptExecutor.h +++ b/React/Base/RCTJavaScriptExecutor.h @@ -49,11 +49,13 @@ __used static id RCTCreateExecutor(Class executorClass) { static NSUInteger executorID = 0; id 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 executor) { - return objc_getAssociatedObject(executor, RCTJavaScriptExecutorID); + return executor ? objc_getAssociatedObject(executor, RCTJavaScriptExecutorID) : @0; }