If InnerJSON and Error exist, use them

Author: Zach Eriksen

iOS_SDK/OneSignalSDK/Source/OneSignalClient.m

@@ -395,7 +395,9 @@ - (void)handleJSONNSURLResponse:(NSURLResponse*)response data:(NSData*)data erro
                 successBlock(nil);
         }
     } else if (failureBlock != nil) {
-        if (innerJson != nil && error == nil)
+        if (innerJson != nil && error != nil)
+            failureBlock([NSError errorWithDomain:@"OneSignalError" code:statusCode userInfo:@{@"returned" : innerJson, @"error": error}]);
+        else if (innerJson != nil)
             failureBlock([NSError errorWithDomain:@"OneSignalError" code:statusCode userInfo:@{@"returned" : innerJson}]);
         else if (error != nil)
             failureBlock([NSError errorWithDomain:@"OneSignalError" code:statusCode userInfo:@{@"error" : error}]);