diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java index e6ad9c4a110..0a183f38af0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java @@ -9,6 +9,7 @@ package com.facebook.react.bridge; import androidx.annotation.Nullable; import androidx.core.util.Pools.SimplePool; +import java.util.Objects; /** Implementation of Dynamic wrapping a ReadableMap. */ class DynamicFromMap implements Dynamic { @@ -96,7 +97,7 @@ class DynamicFromMap implements Dynamic { if (mMap == null || mName == null) { throw new IllegalStateException("This dynamic value has been recycled"); } - return mMap.getMap(mName); + return Objects.requireNonNull(mMap.getMap(mName)); } @Override diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java index b0bc88e14c7..226749c5bbd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java @@ -80,7 +80,10 @@ public class DynamicFromObject implements Dynamic { if (mObject instanceof ReadableArray) { return ReadableType.Array; } - FLog.e(ReactConstants.TAG, "Unmapped object type " + mObject.getClass().getName()); + FLog.e( + ReactConstants.TAG, + "Unmapped object type " + + (mObject == null ? "" : mObject.getClass().getName())); return ReadableType.Null; } }