Moved helper file to the bottom.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/Optimizely.m

@@ -109,7 +109,7 @@ - (OPTLYVariation *)activateExperiment:(NSString *)experimentKey
 
     if (!impressionEvent) {
         [self handleErrorLogsForActivateUser:userId experiment:experimentKey success:NO];
-        return nil;
+        return variation;
     }
 
     NSDictionary *impressionEventParams = [impressionEvent toDictionary];
@@ -418,4 +418,24 @@ - (void)handleErrorLogsForTrackEvent:(NSString *)eventKey
     }
 }
 
+// log and propagate error for a activate failure
+- (void)handleErrorLogsForActivateUser:(NSString *)userId
+                            experiment:(NSString *)experimentKey
+                               success:(BOOL)succeeded
+{
+    if (succeeded) {
+        NSString *logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesActivationSuccess, userId, experimentKey];
+        [self.logger logMessage:logMessage
+                      withLevel:OptimizelyLogLevelInfo];
+    } else {
+        NSString *logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesActivationFailure, userId, experimentKey];
+        NSDictionary *errorMessage = [NSDictionary dictionaryWithObject:logMessage forKey:NSLocalizedDescriptionKey];
+        NSError *error = [NSError errorWithDomain:OPTLYErrorHandlerMessagesDomain
+                                             code:OPTLYErrorTypesUserActivate
+                                         userInfo:errorMessage];
+        [self.errorHandler handleError:error];
+        [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelError];
+    }
+}
+
 @end