diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java
index 33097bc29d..f1a2c603da 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+import javax.annotation.CheckForNull;
 
 import static org.kohsuke.github.Previews.*;
 
@@ -41,8 +42,8 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
     private String body;
     private GHUser user;
     private String path;
-    private int position;
-    private int originalPosition;
+    private int position = -1;
+    private int original_position = -1;
 
     public static GHPullRequestReviewComment draft(String body, String path, int position) {
         GHPullRequestReviewComment result = new GHPullRequestReviewComment();
@@ -82,12 +83,14 @@ public String getPath() {
         return path;
     }
 
-    public int getPosition() {
-        return position;
+    @CheckForNull
+    public Integer getPosition() {
+        return position == -1 ? null : position;
     }
 
+    @CheckForNull
     public int getOriginalPosition() {
-        return originalPosition;
+        return original_position == -1 ? null : original_position;
     }
 
     @Override