diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
index 0a926e99c4d6f9aaf04604ec1053fd491b27963e..328b71095ab0e93cb2a41dbad89d2d960b425f72 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -121,7 +121,12 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
         WritableMap params;
         Bundle extras = newIntent.getExtras();
         if (extras != null) {
-            params = Arguments.fromBundle(extras);
+            try {
+                params = Arguments.fromBundle(extras);
+            } catch (Exception e){
+                Log.e(TAG, e.getMessage());
+                params = Arguments.createMap();
+            }
         } else {
             params = Arguments.createMap();
         }