diff --git a/android/build.gradle b/android/build.gradle
index 9eddec4..cb96182 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -40,6 +40,7 @@ repositories {
 }
 
 dependencies {
+    //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.tencent:mmkv-static:1.2.10'
 }
diff --git a/android/src/main/java/com/fidme/faststorage/RNFastStorageModule.java b/android/src/main/java/com/fidme/faststorage/RNFastStorageModule.java
index 47b15f5..514bf1a 100644
--- a/android/src/main/java/com/fidme/faststorage/RNFastStorageModule.java
+++ b/android/src/main/java/com/fidme/faststorage/RNFastStorageModule.java
@@ -32,9 +32,7 @@ public void setItem(String key, String value, Promise promise) {
       MMKV kv = MMKV.defaultMMKV();
       kv.encode(key, value);
       promise.resolve(value);
-    } catch (Error e) {
-      promise.reject("Error", "Unable to setItem");
-    } catch (Exception e) {
+    } catch (Error | Exception e) {
       promise.reject("Error", "Unable to setItem");
     }
   }
@@ -44,9 +42,7 @@ public void getItem(String key, Promise promise) {
     try {
       MMKV kv = MMKV.defaultMMKV();
       promise.resolve(kv.decodeString(key));
-    } catch (Error e) {
-      promise.reject("Error", "Unable to getItem");
-    } catch (Exception e) {
+    } catch (Error | Exception e) {
       promise.reject("Error", "Unable to getItem");
     }
   }
@@ -57,9 +53,7 @@ public void removeItem(String key, Promise promise) {
       MMKV kv = MMKV.defaultMMKV();
       kv.removeValueForKey(key);
       promise.resolve(key);
-    } catch (Error e) {
-      promise.reject("Error", "Unable to removeItem");
-    } catch (Exception e) {
+    } catch (Error | Exception e) {
       promise.reject("Error", "Unable to removeItem");
     }
   }
@@ -70,9 +64,7 @@ public void clearStore(Promise promise) {
       MMKV kv = MMKV.defaultMMKV();
       kv.clearAll();
       promise.resolve("Done");
-    } catch (Error e) {
-      promise.reject("Error", "Unable to removeItem");
-    } catch (Exception e) {
+    } catch (Error | Exception e) {
       promise.reject("Error", "Unable to removeItem");
     }
   }
diff --git a/index.js b/index.js
index 1741fc2..fe19826 100644
--- a/index.js
+++ b/index.js
@@ -1,8 +1,8 @@
-import {NativeModules} from 'react-native';
+import { NativeModules, Platform } from 'react-native';
 
-const {RNFastStorage} = NativeModules;
+const { RNFastStorage } = NativeModules;
 
-if (RNFastStorage.setupLibrary) RNFastStorage.setupLibrary();
+if (Platform.OS === 'ios' && RNFastStorage.setupLibrary) RNFastStorage.setupLibrary();
 
 export default {
   ...RNFastStorage,