diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java
index c01d0cec..c6db5d45 100644
--- a/java/com/facebook/yoga/YogaNode.java
+++ b/java/com/facebook/yoga/YogaNode.java
@@ -213,6 +213,7 @@ public abstract class YogaNode {
 
   public abstract void setData(Object data);
 
+  @Nullable
   public abstract Object getData();
 
   public abstract void print();
diff --git a/java/com/facebook/yoga/YogaNodeJNIBase.java b/java/com/facebook/yoga/YogaNodeJNIBase.java
index 4981ebd1..7ddfa228 100644
--- a/java/com/facebook/yoga/YogaNodeJNIBase.java
+++ b/java/com/facebook/yoga/YogaNodeJNIBase.java
@@ -14,12 +14,12 @@ import javax.annotation.Nullable;
 @DoNotStrip
 public abstract class YogaNodeJNIBase extends YogaNode {
 
-  private YogaNodeJNIBase mOwner;
+  @Nullable private YogaNodeJNIBase mOwner;
   @Nullable private List<YogaNodeJNIBase> mChildren;
-  private YogaMeasureFunction mMeasureFunction;
-  private YogaBaselineFunction mBaselineFunction;
+  @Nullable private YogaMeasureFunction mMeasureFunction;
+  @Nullable private YogaBaselineFunction mBaselineFunction;
   private long mNativePointer;
-  private Object mData;
+  @Nullable private Object mData;
 
   /* Those flags needs be in sync with YGJNI.cpp */
   private static final int MARGIN = 1;
@@ -623,7 +623,8 @@ public abstract class YogaNodeJNIBase extends YogaNode {
     mData = data;
   }
 
-  public Object getData() {
+  @Override
+  public @Nullable Object getData() {
     return mData;
   }