diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 2f13b1ee6ab..31a1139b697 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -142,7 +142,6 @@ public class ReactTextUpdate {
   public static ReactTextUpdate buildReactTextUpdateFromState(
       Spannable text,
       int jsEventCounter,
-      boolean containsImages,
       int textAlign,
       int textBreakStrategy,
       int justificationMode,
@@ -150,7 +149,7 @@ public class ReactTextUpdate {
 
     ReactTextUpdate textUpdate =
         new ReactTextUpdate(
-            text, jsEventCounter, containsImages, textAlign, textBreakStrategy, justificationMode);
+            text, jsEventCounter, false, textAlign, textBreakStrategy, justificationMode);
 
     textUpdate.mAttributedString = attributedString;
     return textUpdate;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index c5c6e2855c8..4703908cc7b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1086,7 +1086,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
         });
   }
 
-  private class ReactContentSizeWatcher implements ContentSizeWatcher {
+  private static class ReactContentSizeWatcher implements ContentSizeWatcher {
     private ReactEditText mEditText;
     private @Nullable EventDispatcher mEventDispatcher;
     private int mPreviousContentWidth = 0;
@@ -1167,7 +1167,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     }
   }
 
-  private class ReactScrollWatcher implements ScrollWatcher {
+  private static class ReactScrollWatcher implements ScrollWatcher {
 
     private ReactEditText mReactEditText;
     private EventDispatcher mEventDispatcher;
@@ -1235,11 +1235,18 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   @Override
   public Object updateState(
       ReactEditText view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {
+    if (stateWrapper == null) {
+      throw new IllegalArgumentException("Unable to update a NULL state.");
+    }
     ReadableNativeMap state = stateWrapper.getState();
 
     ReadableMap attributedString = state.getMap("attributedString");
     ReadableMap paragraphAttributes = state.getMap("paragraphAttributes");
 
+    if (attributedString == null || paragraphAttributes == null) {
+      throw new IllegalArgumentException("Invalid TextInput State was received as a parameters");
+    }
+
     Spannable spanned =
         TextLayoutManager.getOrCreateSpannableForText(
             view.getContext(), attributedString, mReactTextViewManagerCallback);
@@ -1248,11 +1255,9 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
 
     view.mStateWrapper = stateWrapper;
-
     return ReactTextUpdate.buildReactTextUpdateFromState(
         spanned,
         state.getInt("mostRecentEventCount"),
-        false, // TODO add this into local Data
         TextAttributeProps.getTextAlignment(props, TextLayoutManager.isRTL(attributedString)),
         textBreakStrategy,
         TextAttributeProps.getJustificationMode(props),