diff --git a/ios/MattermostBucket.m b/ios/MattermostBucket.m
index 49ca7e403..3816a9428 100644
--- a/ios/MattermostBucket.m
+++ b/ios/MattermostBucket.m
@@ -109,7 +109,7 @@ RCT_EXPORT_METHOD(removePreference:(NSString *) key
 
 -(void) setPreference:(NSString *)key value:(NSString *) value appGroupId:(NSString*)appGroupId {
   NSUserDefaults* bucket = [self bucketByName: appGroupId];
-  if ([key length] > 0 && [value length] > 0) {
+  if (bucket && [key length] > 0 && [value length] > 0) {
     [bucket setObject:value forKey:key];
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 202e0fbb6..ef5f3fe17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14712,8 +14712,8 @@
       }
     },
     "react-native-fetch-blob": {
-      "version": "github:enahum/react-native-fetch-blob#d6017264dce8704b43a365791be42f09b66b9e9f",
-      "from": "github:enahum/react-native-fetch-blob#d6017264dce8704b43a365791be42f09b66b9e9f",
+      "version": "github:enahum/react-native-fetch-blob#383d8dd2e46e370026c10d9b94a5943ee5fda002",
+      "from": "github:enahum/react-native-fetch-blob#383d8dd2e46e370026c10d9b94a5943ee5fda002",
       "requires": {
         "base-64": "0.1.0",
         "glob": "7.0.6"
diff --git a/package.json b/package.json
index 2e4ba775a..414e85b9f 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "react-native-drawer-layout": "2.0.0",
     "react-native-exception-handler": "2.7.5",
     "react-native-fast-image": "4.0.8",
-    "react-native-fetch-blob": "enahum/react-native-fetch-blob.git#d6017264dce8704b43a365791be42f09b66b9e9f",
+    "react-native-fetch-blob": "enahum/react-native-fetch-blob.git#383d8dd2e46e370026c10d9b94a5943ee5fda002",
     "react-native-image-gallery": "enahum/react-native-image-gallery#a98b1051e94f5a394541ca1ff9b15e2c9ffed84f",
     "react-native-image-picker": "0.26.7",
     "react-native-keyboard-aware-scroll-view": "0.5.0",