diff --git a/android/build.gradle b/android/build.gradle
index 184835289..b8abf51d8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    compile "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    //compile 'com.squareup.okhttp3:okhttp:+'
+    implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
+    //implementation 'com.squareup.okhttp3:okhttp:+'
     //{RNFetchBlob_PRE_0.28_DEPDENDENCY}
 }
diff --git a/ios/RNFetchBlobRequest.m b/ios/RNFetchBlobRequest.m
index 479d108b8..a23a963e3 100644
--- a/ios/RNFetchBlobRequest.m
+++ b/ios/RNFetchBlobRequest.m
@@ -146,7 +146,12 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
     float timeout = [options valueForKey:@"timeout"] == nil ? -1 : [[options valueForKey:@"timeout"] floatValue];
     
     if (timeout > 0) {
-        defaultConfigObject.timeoutIntervalForRequest = timeout/1000;
+        if (uploadTask) {
+            defaultConfigObject.timeoutIntervalForResource = timeout/1000;
+        }
+        else {
+            defaultConfigObject.timeoutIntervalForRequest = timeout/1000;
+        }
     }
     
     defaultConfigObject.HTTPMaximumConnectionsPerHost = 10;
@@ -359,7 +364,9 @@ - (void) cancelRequest:(NSString *)taskId
 
 - (void) URLSession:(NSURLSession *)session didBecomeInvalidWithError:(nullable NSError *)error
 {
-    RCTLog(@"[RNFetchBlobRequest] session didBecomeInvalidWithError %@", [error description]);
+    if (error) {
+        RCTLog(@"[RNFetchBlobRequest] entering URLSession:didBecomeInvalidWithError: %@", [error description]);
+    }
     if ([session isEqual:session]) {
         session = nil;
     }
@@ -368,7 +375,9 @@ - (void) URLSession:(NSURLSession *)session didBecomeInvalidWithError:(nullable
 
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error
 {
-    RCTLog(@"[RNFetchBlobRequest] session didCompleteWithError %@", [error description]);
+    if (error) {
+        RCTLog(@"[RNFetchBlobRequest] URLSession:task:didCompleteWithError: %@", [error description]);
+    }
     self.error = error;
     NSString * errMsg;
     NSString * respStr;